http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/NativeHA/mixedRedundancyTestHA.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/NativeHA/mixedRedundancyTestHA.xml 
b/src/tests/cpp/xml/Generics/NativeHA/mixedRedundancyTestHA.xml
deleted file mode 100644
index a38b189..0000000
--- a/src/tests/cpp/xml/Generics/NativeHA/mixedRedundancyTestHA.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">7m</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="perftests" 
function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="ThinClientHA1"/>
-  <client-set count="10" name="ThinClientHA2"/>
-  <client-set count="10" name="ThinClientHA3"/>
-
-  <test name="TcrHAMixedRedundancy" description="Thin Client HA mixed 
redundancy test">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 NativeHA/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="utils" 
waitTime="30m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="CreateRegion1" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="3m" 
argTypes="Int32,byte[]">
-      <client-set count="10" name="ThinClientHA1"/>
-      <data name="redundancyLevel">0</data>
-    </task>
-    <task name="CreateRegion2" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="3m" 
argTypes="Int32,byte[]">
-      <client-set count="10" name="ThinClientHA2"/>
-      <data name="redundancyLevel">1</data>
-    </task>
-    <task name="CreateRegion3" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="3m" 
argTypes="Int32,byte[]">
-      <client-set count="10" name="ThinClientHA3"/>
-      <data name="redundancyLevel">2</data>
-    </task>
-    <task name="Populating Entries" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" 
argTypes="Int32,byte[]">
-      <client-set begin="6" count="1" name="ThinClientHA1"/>
-    </task>
-    <task name="Register Partial Interest List 1" 
action="doRegisterInterestList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="Int32,byte[]">
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">100</data>
-      <client-set count="10" name="ThinClientHA1"/>
-    </task>
-    <task name="Register Partial Interest List 2" 
action="doRegisterInterestList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="Int32,byte[]">
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">100</data>
-      <client-set count="10" name="ThinClientHA2"/>
-    </task>
-    <task name="Register Partial Interest List 3" 
action="doRegisterInterestList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="Int32,byte[]">
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">100</data>
-      <client-set count="10" name="ThinClientHA3"/>
-    </task>
-
-    <task name="StartCacheServer 3" action="doRunProcess" container="utils" 
waitTime="30m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-
-    <task name="Gets1" action="doGets" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" 
parallel="true" argTypes="Int32,byte[]">
-      <client-set count="5" name="ThinClientHA1"/>
-    </task>
-    <task name="Gets2" action="doGets" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" 
parallel="true" argTypes="Int32,byte[]">
-      <client-set count="5" name="ThinClientHA2"/>
-    </task>
-    <task name="Gets3" action="doGets" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" 
parallel="true" argTypes="Int32,byte[]">
-      <client-set count="5" name="ThinClientHA3"/>
-    </task>
-    <task name="Puts1" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" 
parallel="true" argTypes="Int32,byte[]">
-      <client-set begin="6" count="5" name="ThinClientHA1"/>
-    </task>
-    <task name="Puts2" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" 
parallel="true" argTypes="Int32,byte[]">
-      <client-set begin="6" count="5" name="ThinClientHA2"/>
-    </task>
-    <task name="Puts3" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" 
parallel="true" argTypes="Int32,byte[]">
-      <client-set begin="6" count="5" name="ThinClientHA3"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="Int32,byte[]"/>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S2R1.xml
----------------------------------------------------------------------
diff --git 
a/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S2R1.xml
 
b/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S2R1.xml
deleted file mode 100644
index 9d20604..0000000
--- 
a/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S2R1.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 NativeHA/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="String,byte[]">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="String,byte[]">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="String,byte[]">
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" 
waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Destroyer2"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="String,byte[]"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S3R2.xml
----------------------------------------------------------------------
diff --git 
a/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S3R2.xml
 
b/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S3R2.xml
deleted file mode 100644
index ee28e8e..0000000
--- 
a/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S3R2.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">2</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 NativeHA/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]"> 
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" 
waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Destroyer2"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="String,byte[]"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S3R3.xml
----------------------------------------------------------------------
diff --git 
a/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S3R3.xml
 
b/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S3R3.xml
deleted file mode 100644
index 50abb7d..0000000
--- 
a/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S3R3.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">3</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 NativeHA/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" 
waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Destroyer2"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="String,byte[]"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_PartialInterestTCRHA_S2R1.xml
----------------------------------------------------------------------
diff --git 
a/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_PartialInterestTCRHA_S2R1.xml
 
b/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_PartialInterestTCRHA_S2R1.xml
deleted file mode 100644
index 5e97c8e..0000000
--- 
a/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_PartialInterestTCRHA_S2R1.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 NativeHA/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" 
waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Destroyer2"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="String,byte[]"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_PartialInterestTCRHA_S3R2.xml
----------------------------------------------------------------------
diff --git 
a/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_PartialInterestTCRHA_S3R2.xml
 
b/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_PartialInterestTCRHA_S3R2.xml
deleted file mode 100644
index 82e1706..0000000
--- 
a/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_PartialInterestTCRHA_S3R2.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">2</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 NativeHA/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" 
waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Destroyer2"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="String,byte[]"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_PartialInterestTCRHA_S3R3.xml
----------------------------------------------------------------------
diff --git 
a/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_PartialInterestTCRHA_S3R3.xml
 
b/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_PartialInterestTCRHA_S3R3.xml
deleted file mode 100644
index b56bd45..0000000
--- 
a/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_PartialInterestTCRHA_S3R3.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">3</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 NativeHA/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" 
waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Destroyer2"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="String,byte[]"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/NativePR/CyberTraderInterestListUpdateTest.xml
----------------------------------------------------------------------
diff --git 
a/src/tests/cpp/xml/Generics/NativePR/CyberTraderInterestListUpdateTest.xml 
b/src/tests/cpp/xml/Generics/NativePR/CyberTraderInterestListUpdateTest.xml
deleted file mode 100644
index f66b761..0000000
--- a/src/tests/cpp/xml/Generics/NativePR/CyberTraderInterestListUpdateTest.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1848</item>
-    </list>
-  </data>
-  <data name="expectedCount">1848</data>
-
-  <data name="valueSizes">
-    <list>
-      <item>3000</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set name="JCS5" hostGroup="CS"/>
-  <client-set name="JCS6" hostGroup="CS"/>
-  <client-set name="Publisher"/>
-  <client-set name="Subscriber"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 6 
NativePR/csConflationNotifySubscription.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StartCacheServer 4" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="StartCacheServer 5" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StartCacheServer 6" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Populate Entries in publisher" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">100</data>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Gets Entries in Subscriber" action="doGets" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>500</item>
-        </list>
-      </data>
-      <client-set name="Publisher"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Subscriber"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">100</data>
-      <data name="valueSizes">500</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" 
argTypes="String,byte[]"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServer 4" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="StopCacheServer 5" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServer 6" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/NativePR/CyberTraderPerfVariableIntTest2.xml
----------------------------------------------------------------------
diff --git 
a/src/tests/cpp/xml/Generics/NativePR/CyberTraderPerfVariableIntTest2.xml 
b/src/tests/cpp/xml/Generics/NativePR/CyberTraderPerfVariableIntTest2.xml
deleted file mode 100644
index 507a4d1..0000000
--- a/src/tests/cpp/xml/Generics/NativePR/CyberTraderPerfVariableIntTest2.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">60</data>
-  <data name="cacheType">CLIENT</data>
-
-
-  <data name="distinctKeys">
-    <list>
-      <item>184877</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>80</item>
-      <item>160</item>
-      <item>320</item>
-      <item>640</item>
-      <item>1280</item>
-      <item>2560</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="Publisher"/>
-  <client-set name="Subscriber"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test with puts and 
gets for keyType int">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 NativePR/csNotifySubscription.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-
-    <task name="CreateRegionForPerformanceVariable" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="Int32,byte[]">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" 
argTypes="Int32,byte[]">
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Measure Performance Variable with int keys" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" 
argTypes="Int32,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Publisher"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="Int32,byte[]">
-      <client-set name="Subscriber"/>
-    </task>
-
-    <task name="DestroyRegion" action="doLocalDestroyRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="Int32,byte[]">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/NativePR/CyberTraderPerfVariableTest.xml
----------------------------------------------------------------------
diff --git 
a/src/tests/cpp/xml/Generics/NativePR/CyberTraderPerfVariableTest.xml 
b/src/tests/cpp/xml/Generics/NativePR/CyberTraderPerfVariableTest.xml
deleted file mode 100644
index ac7399d..0000000
--- a/src/tests/cpp/xml/Generics/NativePR/CyberTraderPerfVariableTest.xml
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-
-  <data name="distinctKeys">
-    <list>
-      <item>5000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-      <item>1000</item>
-      <item>10000</item>
-      <item>50000</item>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" 
client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set name="JCS5" hostGroup="CS"/>
-  <client-set name="JCS6" hostGroup="CS"/>
-  <client-set name="Publisher"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test with puts for 
mixed keyType">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 6 NativePR/csNotifySubscription.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StartCacheServer 4" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="StartCacheServer 5" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StartCacheServer 6" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-
-    <task name="CreateRegionForPerformanceVariable" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="Int32,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Measure Performance Variable with int keys" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" 
argTypes="Int32,byte[]">
-      <client-set name="Publisher"/>
-      <data name="keyType">int</data>
-    </task>
-    <task name="LocalDestroyRegion" action="doLocalDestroyRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="Int32,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-
-    <task name="CreateRegionForPerformanceVariable" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Measure Performance Variable with string keys" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" 
argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <data name="keySize">
-        <list>
-          <item>6</item>
-        </list>
-      </data>
-    </task>
-    <task name="Measure Performance Variable with cache size" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <data name="distinctKeys">
-        <list>
-          <item>1</item>
-          <item>100</item>
-          <item>10000</item>
-          <item>184877</item>
-        </list>
-      </data>
-      <data name="valueSizes">
-        <list>
-          <item>100</item>
-        </list>
-      </data>
-    </task>
-    <task name="Measure Performance Variable with payload size" 
action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" 
waitTime="90m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <data name="distinctKeys">
-        <list>
-          <item>184877</item>
-        </list>
-      </data>
-      <data name="valueSizes">
-        <list>
-          <item>80</item>
-          <item>160</item>
-          <item>320</item>
-          <item>640</item>
-          <item>1280</item>
-          <item>2560</item>
-        </list>
-      </data>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServer 4" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="StopCacheServer 5" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServer 6" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/NativePR/CyberTraderPerfVariableTest2.xml
----------------------------------------------------------------------
diff --git 
a/src/tests/cpp/xml/Generics/NativePR/CyberTraderPerfVariableTest2.xml 
b/src/tests/cpp/xml/Generics/NativePR/CyberTraderPerfVariableTest2.xml
deleted file mode 100644
index 9022f12..0000000
--- a/src/tests/cpp/xml/Generics/NativePR/CyberTraderPerfVariableTest2.xml
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">60</data>
-  <data name="cacheType">CLIENT</data>
-
-
-  <data name="distinctKeys">
-    <list>
-      <item>184877</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>80</item>
-      <item>160</item>
-      <item>320</item>
-      <item>640</item>
-      <item>1280</item>
-      <item>2560</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set name="Publisher"/>
-  <client-set name="Subscriber"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test with puts and 
gets for keyType string">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 NativePR/csNotifySubscription.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-
-    <task name="CreateRegionForPerformanceVariable" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" 
argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Measure Performance Variable with string keys" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" 
argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <data name="keySize">
-        <list>
-          <item>6</item>
-        </list>
-      </data>
-    </task>
-    <task name="Measure Performance Variable with cache size" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" 
argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <data name="distinctKeys">
-        <list>
-          <item>1</item>
-          <item>100</item>
-          <item>10000</item>
-          <item>184877</item>
-        </list>
-      </data>
-      <data name="valueSizes">
-        <list>
-          <item>100</item>
-        </list>
-      </data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Publisher"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-    </task>
-
-    <task name="Measure Performance Variable with payload size" 
action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" 
waitTime="45m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <data name="valueSizes">
-        <list>
-          <item>80</item>
-          <item>160</item>
-          <item>320</item>
-          <item>640</item>
-          <item>1280</item>
-          <item>2560</item>
-        </list>
-      </data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Publisher"/>
-      <data name="sleepTime">5</data>
-    </task>
-
-    <task name="StartCacheServer 3" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StartCacheServer 4" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Measure Performance Variable with cache size with 3rd cache 
member" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" 
argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <data name="distinctKeys">
-        <list>
-          <item>1</item>
-          <item>100</item>
-          <item>10000</item>
-          <item>184877</item>
-        </list>
-      </data>
-      <data name="valueSizes">
-        <list>
-          <item>100</item>
-        </list>
-      </data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Publisher"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Measure Get Throughput with 3rd cache member" action="doGets" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-    </task>
-
-    <task name="Measure Performance Variable with payload size with 3rd cache 
member" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="90m" 
argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <data name="valueSizes">
-        <list>
-          <item>80</item>
-          <item>160</item>
-          <item>320</item>
-          <item>640</item>
-          <item>1280</item>
-          <item>2560</item>
-        </list>
-      </data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Publisher"/>
-      <data name="sleepTime">5</data>
-    </task>
-
-    <task name="DestroyRegion" action="doLocalDestroyRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServer 4" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/NativePR/clientEventsFailover.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/NativePR/clientEventsFailover.xml 
b/src/tests/cpp/xml/Generics/NativePR/clientEventsFailover.xml
deleted file mode 100644
index f2da0b7..0000000
--- a/src/tests/cpp/xml/Generics/NativePR/clientEventsFailover.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-  <data name="BBName">CacheServer</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-  
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="sleepTime">
-    <oneof>
-      <item>20</item>
-      <item>30</item>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-    </oneof>
-  </data>
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>stop</item>
-      <item>stop</item>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-  <data name="minServers">2</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-     </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="perftests" 
function="createPerfTestCacheListener"/>
-       </region-attributes>
-     </region>
-    </snippet>
-  </data>
-
-  <client-set name="Feeder"/>
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set count="30" name="Client"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry 
events">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" 
waitTime="10m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 NativePR/csNotifySubscription.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StartCacheServer 4" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Init Feeder" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" 
argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegion</data> 
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" 
argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegionWithListener</data> 
-      <client-set count="30" name="Client"/>
-    </task>    
-    <task name="Register All Keys" action="doRegisterAllKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" 
argTypes="String,byte[]">
-      <client-set name="Feeder"/>
-      <client-set count="30" name="Client"/>
-    </task>
-    <task name="FeedSystem" action="doFeed" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" 
argTypes="String,byte[]">
-      <data name="entryCount">5000</data>
-      <data name="opsSecond">1200</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Client Events" action="doEntryOperations" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="30m" 
parallel="true" argTypes="String,byte[]">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>read</item>
-          <item>read</item>
-          <item>read</item>
-          <item>putAll</item>
-          <item>getAll</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">15m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">5000</data>
-      <data name="valueSizes">100</data>
-      <client-set name="Feeder"/>
-      <client-set count="30" name="Client"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" 
container="utils" timesToRun="2" waitTime="30m" continueOnError="true" 
parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" 
container="utils" timesToRun="2" waitTime="30m" continueOnError="true" 
parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" 
container="utils" timesToRun="2" waitTime="30m" continueOnError="true" 
parallel="true">
-      <data name="ServerId">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="stopStartCacheServer 4" action="doStopStartServer" 
container="utils" timesToRun="2" waitTime="30m" continueOnError="true" 
parallel="true">
-      <data name="ServerId">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" 
argTypes="String,byte[]"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServer 4" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/NativePR/csConflationNotifySubscription.xml
----------------------------------------------------------------------
diff --git 
a/src/tests/cpp/xml/Generics/NativePR/csConflationNotifySubscription.xml 
b/src/tests/cpp/xml/Generics/NativePR/csConflationNotifySubscription.xml
deleted file mode 100644
index a2bfee0..0000000
--- a/src/tests/cpp/xml/Generics/NativePR/csConflationNotifySubscription.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache";
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-       xsi:schemaLocation="http://geode.apache.org/schema/cache 
http://geode.apache.org/schema/cache/cache-1.0.xsd";
-       version="1.0">
-  <cache-server port="$PORT_NUM" />
-  <region name="TestTCR1">
-    <region-attributes enable-subscription-conflation="true">
-      <partition-attributes redundant-copies="2"/>
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/NativePR/csNotifySubscription.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/NativePR/csNotifySubscription.xml 
b/src/tests/cpp/xml/Generics/NativePR/csNotifySubscription.xml
deleted file mode 100644
index 963cea2..0000000
--- a/src/tests/cpp/xml/Generics/NativePR/csNotifySubscription.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache";
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-       xsi:schemaLocation="http://geode.apache.org/schema/cache 
http://geode.apache.org/schema/cache/cache-1.0.xsd";
-       version="1.0">
-  <cache-server port="$PORT_NUM" />
-  <region name="TestTCR1">
-    <region-attributes>
-      <partition-attributes redundant-copies="1"/>
-    </region-attributes>
-  </region>
-</cache> 

Reply via email to