http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/NewFwkLib/CacheServer.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewFwkLib/CacheServer.cs 
b/src/tests/cli/NewFwkLib/CacheServer.cs
index a849187..8ad9440 100644
--- a/src/tests/cli/NewFwkLib/CacheServer.cs
+++ b/src/tests/cli/NewFwkLib/CacheServer.cs
@@ -26,7 +26,7 @@ using PdxTests;
 namespace Apache.Geode.Client.FwkLib
 {
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Tests.NewAPI;
+  using Apache.Geode.Client.Tests;
   using Apache.Geode.Client;
   using QueryCategory = Apache.Geode.Client.Tests.QueryCategory;
   using QueryStrings = Apache.Geode.Client.Tests.QueryStrings;
@@ -1137,8 +1137,8 @@ namespace Apache.Geode.Client.FwkLib
         remoteQuery(currentQuery, isLargeSetQuery, isUnsupportedPRQuery, 
i,false,false);
         i = Util.Rand(QueryStrings.SSsize);
         int[] a = new int[] { 4, 6, 7, 9, 12, 14, 15, 16 };
-        if 
((typeof(TVal).Equals(typeof(Apache.Geode.Client.Tests.NewAPI.PortfolioPdx)) ||
-          
(typeof(TVal).Equals(typeof(Apache.Geode.Client.Tests.NewAPI.PositionPdx)))) && 
((IList<int>)a).Contains(i))
+        if 
((typeof(TVal).Equals(typeof(Apache.Geode.Client.Tests.PortfolioPdx)) ||
+          
(typeof(TVal).Equals(typeof(Apache.Geode.Client.Tests.PositionPdx)))) && 
((IList<int>)a).Contains(i))
         {
           FwkInfo("Skiping Query for pdx object [{0}]", 
QueryStatics.StructSetQueries[i]);
         }
@@ -1151,8 +1151,8 @@ namespace Apache.Geode.Client.FwkLib
         currentQuery = QueryStatics.ResultSetParamQueries[i];
         remoteQuery(currentQuery, isLargeSetQuery, isUnsupportedPRQuery, 
i,true,false);
         i = Util.Rand(QueryStrings.SSPsize);
-        if 
((typeof(TVal).Equals(typeof(Apache.Geode.Client.Tests.NewAPI.PortfolioPdx)) ||
-          
(typeof(TVal).Equals(typeof(Apache.Geode.Client.Tests.NewAPI.PositionPdx)))) && 
((IList<int>)a).Contains(i))
+        if 
((typeof(TVal).Equals(typeof(Apache.Geode.Client.Tests.PortfolioPdx)) ||
+          
(typeof(TVal).Equals(typeof(Apache.Geode.Client.Tests.PositionPdx)))) && 
((IList<int>)a).Contains(i))
         {
           FwkInfo("Skiping Query for pdx object [{0}]", 
QueryStatics.StructSetParamQueries[i]);
         }

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/NewFwkLib/DeltaTest/DeltaClientValidationListener.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewFwkLib/DeltaTest/DeltaClientValidationListener.cs 
b/src/tests/cli/NewFwkLib/DeltaTest/DeltaClientValidationListener.cs
index 53385be..de16549 100644
--- a/src/tests/cli/NewFwkLib/DeltaTest/DeltaClientValidationListener.cs
+++ b/src/tests/cli/NewFwkLib/DeltaTest/DeltaClientValidationListener.cs
@@ -22,7 +22,7 @@ using System.Collections.Generic;
 namespace Apache.Geode.Client.FwkLib
 {
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Tests.NewAPI;
+  using Apache.Geode.Client.Tests;
   using Apache.Geode.Client;
   public class DeltaClientValidationListener<TKey, TVal> : 
CacheListenerAdapter<TKey, TVal>
   {

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/NewFwkLib/DeltaTest/DeltaTest.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewFwkLib/DeltaTest/DeltaTest.cs 
b/src/tests/cli/NewFwkLib/DeltaTest/DeltaTest.cs
index 121127d..8f3a046 100644
--- a/src/tests/cli/NewFwkLib/DeltaTest/DeltaTest.cs
+++ b/src/tests/cli/NewFwkLib/DeltaTest/DeltaTest.cs
@@ -27,7 +27,7 @@ using Apache.Geode.Client.Tests;
 namespace Apache.Geode.Client.FwkLib
 {
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Tests.NewAPI;
+  using Apache.Geode.Client.Tests;
   using Apache.Geode.Client;
   public class PutTask<TKey, TVal> : ClientTask
   {

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/NewFwkLib/FwkTask.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewFwkLib/FwkTask.cs 
b/src/tests/cli/NewFwkLib/FwkTask.cs
index 54b16ee..a48fc77 100644
--- a/src/tests/cli/NewFwkLib/FwkTask.cs
+++ b/src/tests/cli/NewFwkLib/FwkTask.cs
@@ -328,7 +328,7 @@ namespace Apache.Geode.Client.FwkLib
                 }
                 else
                 {
-                  typName = "Apache.Geode.Client.Tests.NewAPI." + typName;
+                  typName = "Apache.Geode.Client.Tests." + typName;
                   types[index] = loadAssmb.GetType(typName.Trim(), true, true);
                   //Util.Log("rjk: FwkTask: typeAttrib for userobject 34 
argname {0}", typName);
                 }

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/NewFwkLib/FwkTest.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewFwkLib/FwkTest.cs 
b/src/tests/cli/NewFwkLib/FwkTest.cs
index 2b554c2..904e3c3 100644
--- a/src/tests/cli/NewFwkLib/FwkTest.cs
+++ b/src/tests/cli/NewFwkLib/FwkTest.cs
@@ -27,9 +27,9 @@ using System.Xml;
 namespace Apache.Geode.Client.FwkLib
 {
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Tests.NewAPI;
+  using Apache.Geode.Client.Tests;
   using Apache.Geode.Client;
-  using NEWAPI = Apache.Geode.Client.Tests.NewAPI;
+  using NEWAPI = Apache.Geode.Client.Tests;
   //using Region = Apache.Geode.Client.IRegion<Object, Object>;
 
 

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/NewFwkLib/PdxTest/PdxTests.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewFwkLib/PdxTest/PdxTests.cs 
b/src/tests/cli/NewFwkLib/PdxTest/PdxTests.cs
index e15ab22..12d6186 100644
--- a/src/tests/cli/NewFwkLib/PdxTest/PdxTests.cs
+++ b/src/tests/cli/NewFwkLib/PdxTest/PdxTests.cs
@@ -28,7 +28,7 @@ using PdxTests;
 namespace Apache.Geode.Client.FwkLib
 {
     using Apache.Geode.DUnitFramework;
-    using Apache.Geode.Client.Tests.NewAPI;
+    using Apache.Geode.Client.Tests;
     using Apache.Geode.Client;
     using QueryCategory = Apache.Geode.Client.Tests.QueryCategory;
     using QueryStrings = Apache.Geode.Client.Tests.QueryStrings;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/NewFwkLib/QueryTest/QueryTests.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewFwkLib/QueryTest/QueryTests.cs 
b/src/tests/cli/NewFwkLib/QueryTest/QueryTests.cs
index add9b3a..e54b493 100644
--- a/src/tests/cli/NewFwkLib/QueryTest/QueryTests.cs
+++ b/src/tests/cli/NewFwkLib/QueryTest/QueryTests.cs
@@ -19,12 +19,12 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-using Apache.Geode.Client.Tests.NewAPI; // for Portfolio and Position classes
+using Apache.Geode.Client.Tests; // for Portfolio and Position classes
 
 namespace Apache.Geode.Client.FwkLib
 {
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Tests.NewAPI;
+  using Apache.Geode.Client.Tests;
   using Apache.Geode.Client;
   using QueryCategory = Apache.Geode.Client.Tests.QueryCategory;
   using QueryStrings = Apache.Geode.Client.Tests.QueryStrings;
@@ -501,8 +501,8 @@ namespace Apache.Geode.Client.FwkLib
             QueryStatics.StructSetQueries[index].IsLargeResultset == 
isLargeSetQuery)
           {
             int [] a = new int[] {4,6,7,9,12,14,15,16};
-            if 
((typeof(TVal).Equals(typeof(Apache.Geode.Client.Tests.NewAPI.PortfolioPdx))||
-              
(typeof(TVal).Equals(typeof(Apache.Geode.Client.Tests.NewAPI.PositionPdx)))) && 
((IList<int>)a).Contains(index))
+            if 
((typeof(TVal).Equals(typeof(Apache.Geode.Client.Tests.PortfolioPdx))||
+              
(typeof(TVal).Equals(typeof(Apache.Geode.Client.Tests.PositionPdx)))) && 
((IList<int>)a).Contains(index))
             {
               FwkInfo("Skiping Query for pdx object [{0}]", 
QueryStatics.StructSetQueries[index].Query);
             }
@@ -1398,8 +1398,8 @@ namespace Apache.Geode.Client.FwkLib
           FwkInfo("Getting inside for registeration");
           Serializable.RegisterTypeGeneric(Position.CreateDeserializable);
           Serializable.RegisterTypeGeneric(Portfolio.CreateDeserializable);
-          
Serializable.RegisterPdxType(Apache.Geode.Client.Tests.NewAPI.PortfolioPdx.CreateDeserializable);
-          
Serializable.RegisterPdxType(Apache.Geode.Client.Tests.NewAPI.PositionPdx.CreateDeserializable);
+          
Serializable.RegisterPdxType(Apache.Geode.Client.Tests.PortfolioPdx.CreateDeserializable);
+          
Serializable.RegisterPdxType(Apache.Geode.Client.Tests.PositionPdx.CreateDeserializable);
 
         }
         IRegion<TKey, TVal> parentRegion = null;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/NewFwkLib/ResumableTx/ResumableTx.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewFwkLib/ResumableTx/ResumableTx.cs 
b/src/tests/cli/NewFwkLib/ResumableTx/ResumableTx.cs
index b430c2a..eb00b57 100644
--- a/src/tests/cli/NewFwkLib/ResumableTx/ResumableTx.cs
+++ b/src/tests/cli/NewFwkLib/ResumableTx/ResumableTx.cs
@@ -24,7 +24,7 @@ using System.Threading;
 namespace Apache.Geode.Client.FwkLib
 {
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Tests.NewAPI;
+  using Apache.Geode.Client.Tests;
   using Apache.Geode.Client;
 
   public class EntryTxTask<TKey, TVal> : ClientTask

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/NewFwkLib/ResumableTx/TxInfo.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewFwkLib/ResumableTx/TxInfo.cs 
b/src/tests/cli/NewFwkLib/ResumableTx/TxInfo.cs
index a38e6dd..97218b4 100644
--- a/src/tests/cli/NewFwkLib/ResumableTx/TxInfo.cs
+++ b/src/tests/cli/NewFwkLib/ResumableTx/TxInfo.cs
@@ -24,7 +24,7 @@ using System.Threading;
 namespace Apache.Geode.Client.FwkLib  
 {
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Tests.NewAPI;
+  using Apache.Geode.Client.Tests;
   using Apache.Geode.Client;
   
 

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/NewFwkLib/SmokePerf/ObjectHelper.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewFwkLib/SmokePerf/ObjectHelper.cs 
b/src/tests/cli/NewFwkLib/SmokePerf/ObjectHelper.cs
index 2b28676..c0f395d 100644
--- a/src/tests/cli/NewFwkLib/SmokePerf/ObjectHelper.cs
+++ b/src/tests/cli/NewFwkLib/SmokePerf/ObjectHelper.cs
@@ -19,7 +19,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Threading;
-using Apache.Geode.Client.Tests.NewAPI;
+using Apache.Geode.Client.Tests;
 namespace Apache.Geode.Client.FwkLib
 {
   using Apache.Geode.DUnitFramework;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/NewFwkLib/SmokePerf/SmokePerf.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewFwkLib/SmokePerf/SmokePerf.cs 
b/src/tests/cli/NewFwkLib/SmokePerf/SmokePerf.cs
index d10df07..6d28fbc 100644
--- a/src/tests/cli/NewFwkLib/SmokePerf/SmokePerf.cs
+++ b/src/tests/cli/NewFwkLib/SmokePerf/SmokePerf.cs
@@ -21,7 +21,7 @@ using System.Text;
 using System.IO;
 using System.Text.RegularExpressions;
 using System.Threading;
-using Apache.Geode.Client.Tests.NewAPI;
+using Apache.Geode.Client.Tests;
 namespace Apache.Geode.Client.FwkLib
 {
   using Apache.Geode.DUnitFramework;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/NewFwkLib/SmokePerf/SmokeTasks.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewFwkLib/SmokePerf/SmokeTasks.cs 
b/src/tests/cli/NewFwkLib/SmokePerf/SmokeTasks.cs
index f0394c8..49b8bf9 100644
--- a/src/tests/cli/NewFwkLib/SmokePerf/SmokeTasks.cs
+++ b/src/tests/cli/NewFwkLib/SmokePerf/SmokeTasks.cs
@@ -19,7 +19,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Threading;
-using Apache.Geode.Client.Tests.NewAPI;
+using Apache.Geode.Client.Tests;
 using Apache.Geode.DUnitFramework;
 
 namespace Apache.Geode.Client.FwkLib

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/NewFwkLib/Utils.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewFwkLib/Utils.cs b/src/tests/cli/NewFwkLib/Utils.cs
index ab5d4a8..28e1acc 100644
--- a/src/tests/cli/NewFwkLib/Utils.cs
+++ b/src/tests/cli/NewFwkLib/Utils.cs
@@ -27,9 +27,9 @@ namespace Apache.Geode.Client.FwkLib
 {
 
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Tests.NewAPI;
+  using Apache.Geode.Client.Tests;
   using Apache.Geode.Client;
-  using NEWAPI = Apache.Geode.Client.Tests.NewAPI;
+  using NEWAPI = Apache.Geode.Client.Tests;
   [Serializable]
   struct HostInfo
   {

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/NewTestObject/ArrayOfByte.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewTestObject/ArrayOfByte.cs 
b/src/tests/cli/NewTestObject/ArrayOfByte.cs
index afc847a..ba04aa2 100644
--- a/src/tests/cli/NewTestObject/ArrayOfByte.cs
+++ b/src/tests/cli/NewTestObject/ArrayOfByte.cs
@@ -17,7 +17,7 @@
 
 using System;
 using System.IO;
-namespace Apache.Geode.Client.Tests.NewAPI
+namespace Apache.Geode.Client.Tests
 {
   using Apache.Geode.Client;
   public class ArrayOfByte

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/NewTestObject/BatchObject.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewTestObject/BatchObject.cs 
b/src/tests/cli/NewTestObject/BatchObject.cs
index 77f0806..9591744 100644
--- a/src/tests/cli/NewTestObject/BatchObject.cs
+++ b/src/tests/cli/NewTestObject/BatchObject.cs
@@ -17,7 +17,7 @@
 
 using System;
 
-namespace Apache.Geode.Client.Tests.NewAPI
+namespace Apache.Geode.Client.Tests
 {
   using Apache.Geode.Client;
   public class BatchObject

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/NewTestObject/DeltaFastAssetAccount.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewTestObject/DeltaFastAssetAccount.cs 
b/src/tests/cli/NewTestObject/DeltaFastAssetAccount.cs
index ae8a40b..1c1690f 100644
--- a/src/tests/cli/NewTestObject/DeltaFastAssetAccount.cs
+++ b/src/tests/cli/NewTestObject/DeltaFastAssetAccount.cs
@@ -18,7 +18,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-namespace Apache.Geode.Client.Tests.NewAPI
+namespace Apache.Geode.Client.Tests
 {
   using Apache.Geode.Client;
   public class DeltaFastAssetAccount

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/NewTestObject/DeltaPSTObject.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewTestObject/DeltaPSTObject.cs 
b/src/tests/cli/NewTestObject/DeltaPSTObject.cs
index 9e91a04..cc51974 100644
--- a/src/tests/cli/NewTestObject/DeltaPSTObject.cs
+++ b/src/tests/cli/NewTestObject/DeltaPSTObject.cs
@@ -17,7 +17,7 @@
 
 using System;
 
-namespace Apache.Geode.Client.Tests.NewAPI
+namespace Apache.Geode.Client.Tests
 {
   using Apache.Geode.Client;
   public class DeltaPSTObject

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/NewTestObject/DeltaTestImpl.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewTestObject/DeltaTestImpl.cs 
b/src/tests/cli/NewTestObject/DeltaTestImpl.cs
index 5a276a9..9b8c3df 100644
--- a/src/tests/cli/NewTestObject/DeltaTestImpl.cs
+++ b/src/tests/cli/NewTestObject/DeltaTestImpl.cs
@@ -17,7 +17,7 @@
 
 using System;
 using System.Collections.Generic;
-namespace Apache.Geode.Client.Tests.NewAPI
+namespace Apache.Geode.Client.Tests
 {
   using Apache.Geode.Client;
   public class DeltaTestImpl

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/NewTestObject/EqStruct.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewTestObject/EqStruct.cs 
b/src/tests/cli/NewTestObject/EqStruct.cs
index d2449c7..9e53d80 100644
--- a/src/tests/cli/NewTestObject/EqStruct.cs
+++ b/src/tests/cli/NewTestObject/EqStruct.cs
@@ -18,7 +18,7 @@
 
 using System;
 
-namespace Apache.Geode.Client.Tests.NewAPI
+namespace Apache.Geode.Client.Tests
 {
     using Apache.Geode.Client;
     public class EqStruct

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/NewTestObject/FastAsset.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewTestObject/FastAsset.cs 
b/src/tests/cli/NewTestObject/FastAsset.cs
index 87bc903..56d1bf2 100644
--- a/src/tests/cli/NewTestObject/FastAsset.cs
+++ b/src/tests/cli/NewTestObject/FastAsset.cs
@@ -16,7 +16,7 @@
  */
 
 using System;
-namespace Apache.Geode.Client.Tests.NewAPI
+namespace Apache.Geode.Client.Tests
 {
   using Apache.Geode.DUnitFramework;
   using Apache.Geode.Client;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/NewTestObject/FastAssetAccount.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewTestObject/FastAssetAccount.cs 
b/src/tests/cli/NewTestObject/FastAssetAccount.cs
index fd8b132..27d3797 100644
--- a/src/tests/cli/NewTestObject/FastAssetAccount.cs
+++ b/src/tests/cli/NewTestObject/FastAssetAccount.cs
@@ -18,7 +18,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-namespace Apache.Geode.Client.Tests.NewAPI
+namespace Apache.Geode.Client.Tests
 {
   using Apache.Geode.Client;
   // need to implement

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/NewTestObject/NoopAuthInit.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewTestObject/NoopAuthInit.cs 
b/src/tests/cli/NewTestObject/NoopAuthInit.cs
index bb17552..df0907f 100644
--- a/src/tests/cli/NewTestObject/NoopAuthInit.cs
+++ b/src/tests/cli/NewTestObject/NoopAuthInit.cs
@@ -17,7 +17,7 @@
 
 using System;
 
-namespace Apache.Geode.Client.Tests.NewAPI
+namespace Apache.Geode.Client.Tests
 {
   using Apache.Geode.Client;
   public class NoopAuthInit

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/NewTestObject/PSTObject.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewTestObject/PSTObject.cs 
b/src/tests/cli/NewTestObject/PSTObject.cs
index c9534a9..3af50b6 100644
--- a/src/tests/cli/NewTestObject/PSTObject.cs
+++ b/src/tests/cli/NewTestObject/PSTObject.cs
@@ -17,7 +17,7 @@
 
 using System;
 
-namespace Apache.Geode.Client.Tests.NewAPI
+namespace Apache.Geode.Client.Tests
 {
   using Apache.Geode.Client;
   public class PSTObject

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/NewTestObject/PdxAutoSerializerObj.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewTestObject/PdxAutoSerializerObj.cs 
b/src/tests/cli/NewTestObject/PdxAutoSerializerObj.cs
index d477113..215b01c 100644
--- a/src/tests/cli/NewTestObject/PdxAutoSerializerObj.cs
+++ b/src/tests/cli/NewTestObject/PdxAutoSerializerObj.cs
@@ -17,7 +17,7 @@
 
 using System;
 
-namespace Apache.Geode.Client.Tests.NewAPI
+namespace Apache.Geode.Client.Tests
 {
    using Apache.Geode.Client;
     using System.Collections;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/NewTestObject/Portfolio.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewTestObject/Portfolio.cs 
b/src/tests/cli/NewTestObject/Portfolio.cs
index 322517f..526e908 100644
--- a/src/tests/cli/NewTestObject/Portfolio.cs
+++ b/src/tests/cli/NewTestObject/Portfolio.cs
@@ -17,7 +17,7 @@
 
 using System;
 using System.Collections.Generic;
-namespace Apache.Geode.Client.Tests.NewAPI
+namespace Apache.Geode.Client.Tests
 {
 
   using Apache.Geode.Client;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/NewTestObject/PortfolioPdx.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewTestObject/PortfolioPdx.cs 
b/src/tests/cli/NewTestObject/PortfolioPdx.cs
index 5cc76fc..23ae78f 100644
--- a/src/tests/cli/NewTestObject/PortfolioPdx.cs
+++ b/src/tests/cli/NewTestObject/PortfolioPdx.cs
@@ -20,7 +20,7 @@ using System.Collections;
 using Apache.Geode.Client;
 
 
-namespace Apache.Geode.Client.Tests.NewAPI
+namespace Apache.Geode.Client.Tests
 {
   /// <summary>
   /// User class for testing the put functionality for object.

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/NewTestObject/Position.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewTestObject/Position.cs 
b/src/tests/cli/NewTestObject/Position.cs
index 296e561..1a82c33 100644
--- a/src/tests/cli/NewTestObject/Position.cs
+++ b/src/tests/cli/NewTestObject/Position.cs
@@ -17,7 +17,7 @@
 
 using System;
 
-namespace Apache.Geode.Client.Tests.NewAPI
+namespace Apache.Geode.Client.Tests
 {
   using Apache.Geode.Client;
   public class Position

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/NewTestObject/PositionPdx.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewTestObject/PositionPdx.cs 
b/src/tests/cli/NewTestObject/PositionPdx.cs
index 1d273b0..5865ad2 100644
--- a/src/tests/cli/NewTestObject/PositionPdx.cs
+++ b/src/tests/cli/NewTestObject/PositionPdx.cs
@@ -18,7 +18,7 @@
 using System;
 using Apache.Geode.Client;
 
-namespace Apache.Geode.Client.Tests.NewAPI
+namespace Apache.Geode.Client.Tests
 {
   public class PositionPdx
     : IPdxSerializable

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/NewTestObject/SimpleCacheListener.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewTestObject/SimpleCacheListener.cs 
b/src/tests/cli/NewTestObject/SimpleCacheListener.cs
index 8bb2b3f..60ebd20 100644
--- a/src/tests/cli/NewTestObject/SimpleCacheListener.cs
+++ b/src/tests/cli/NewTestObject/SimpleCacheListener.cs
@@ -18,7 +18,7 @@
 using System;
 using Apache.Geode.Client;
 
-namespace Apache.Geode.Client.Tests.NewAPI
+namespace Apache.Geode.Client.Tests
 {
   using Apache.Geode.DUnitFramework;
   /// <summary>

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/NewTestObject/TestObject1.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewTestObject/TestObject1.cs 
b/src/tests/cli/NewTestObject/TestObject1.cs
index 38825ef..6409c77 100644
--- a/src/tests/cli/NewTestObject/TestObject1.cs
+++ b/src/tests/cli/NewTestObject/TestObject1.cs
@@ -17,7 +17,7 @@
 
 using System;
 
-namespace Apache.Geode.Client.Tests.NewAPI
+namespace Apache.Geode.Client.Tests
 {
   using Apache.Geode.Client;
   public class TestObject1

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/NewTestObject/TimeStampdObject.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewTestObject/TimeStampdObject.cs 
b/src/tests/cli/NewTestObject/TimeStampdObject.cs
index cd81075..d8167b6 100644
--- a/src/tests/cli/NewTestObject/TimeStampdObject.cs
+++ b/src/tests/cli/NewTestObject/TimeStampdObject.cs
@@ -17,7 +17,7 @@
 
 using System;
 
-namespace Apache.Geode.Client.Tests.NewAPI
+namespace Apache.Geode.Client.Tests
 {
   using Apache.Geode.Client;
   public class TimeStampdObject

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/PkcsWrapper/PkcsAuthInitMN.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cli/PkcsWrapper/PkcsAuthInitMN.cpp 
b/src/tests/cli/PkcsWrapper/PkcsAuthInitMN.cpp
index 996b5ba..46fbc11 100644
--- a/src/tests/cli/PkcsWrapper/PkcsAuthInitMN.cpp
+++ b/src/tests/cli/PkcsWrapper/PkcsAuthInitMN.cpp
@@ -20,7 +20,7 @@
 #include "impl/ManagedString.hpp"
 
 using namespace System;
-using namespace Apache::Geode::Client::Tests::NewAPI;
+using namespace Apache::Geode::Client::Tests;
 using namespace Apache::Geode::Client;
 
 PkcsAuthInit::PkcsAuthInit() 

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/PkcsWrapper/PkcsAuthInitMN.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cli/PkcsWrapper/PkcsAuthInitMN.hpp 
b/src/tests/cli/PkcsWrapper/PkcsAuthInitMN.hpp
index a5255b7..1a9d00f 100644
--- a/src/tests/cli/PkcsWrapper/PkcsAuthInitMN.hpp
+++ b/src/tests/cli/PkcsWrapper/PkcsAuthInitMN.hpp
@@ -30,19 +30,17 @@ namespace Apache
   {
     namespace Client
     {
-namespace Tests
-        {
-          namespace NewAPI
-          {
-          public ref class PkcsAuthInit sealed
+      namespace Tests
+      {
+        public ref class PkcsAuthInit sealed
           : public 
Internal::SBWrap<apache::geode::client::PKCSAuthInitInternal>,
-            public Apache::Geode::Client::IAuthInitialize/*<String^, Object^>*/
+          public Apache::Geode::Client::IAuthInitialize/*<String^, Object^>*/
         {
         public:
-          
-          PkcsAuthInit();          
 
-          ~PkcsAuthInit();          
+          PkcsAuthInit();
+
+          ~PkcsAuthInit();
 
           //generic <class TPropKey, class TPropValue>
           virtual Apache::Geode::Client::Properties<String^, Object^> ^
@@ -51,11 +49,10 @@ namespace Tests
 
           virtual void Close();
 
-        internal:            
-          PkcsAuthInit( apache::geode::client::PKCSAuthInitInternal* nativeptr 
)
-            : SBWrap( nativeptr ) { }
+        internal:
+          PkcsAuthInit(apache::geode::client::PKCSAuthInitInternal* nativeptr)
+            : SBWrap(nativeptr) { }
         };
-        } // end namespace NewAPI
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/QueryHelper/QueryHelperN.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/QueryHelper/QueryHelperN.cs 
b/src/tests/cli/QueryHelper/QueryHelperN.cs
index 1d4d012..2a861e2 100644
--- a/src/tests/cli/QueryHelper/QueryHelperN.cs
+++ b/src/tests/cli/QueryHelper/QueryHelperN.cs
@@ -17,7 +17,7 @@
 
 using System;
 
-namespace Apache.Geode.Client.Tests.NewAPI
+namespace Apache.Geode.Client.Tests
 {
   using Apache.Geode.DUnitFramework;
   using Apache.Geode.Client;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/SecurityUtil/AuthzCredentialGeneratorN.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/SecurityUtil/AuthzCredentialGeneratorN.cs 
b/src/tests/cli/SecurityUtil/AuthzCredentialGeneratorN.cs
index d7d8a7f..84ad334 100644
--- a/src/tests/cli/SecurityUtil/AuthzCredentialGeneratorN.cs
+++ b/src/tests/cli/SecurityUtil/AuthzCredentialGeneratorN.cs
@@ -18,7 +18,7 @@
 using System;
 using Apache.Geode.DUnitFramework;
 
-namespace Apache.Geode.Client.Tests.NewAPI
+namespace Apache.Geode.Client.Tests
 {
   using Apache.Geode.Client;
   /// <summary>

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/SecurityUtil/CredentialGeneratorN.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/SecurityUtil/CredentialGeneratorN.cs 
b/src/tests/cli/SecurityUtil/CredentialGeneratorN.cs
index 196b44e..524e5ee 100644
--- a/src/tests/cli/SecurityUtil/CredentialGeneratorN.cs
+++ b/src/tests/cli/SecurityUtil/CredentialGeneratorN.cs
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-namespace Apache.Geode.Client.Tests.NewAPI
+namespace Apache.Geode.Client.Tests
 {
   using Apache.Geode.Client;
   /// <summary>

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/SecurityUtil/DummyAuthorization3N.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/SecurityUtil/DummyAuthorization3N.cs 
b/src/tests/cli/SecurityUtil/DummyAuthorization3N.cs
index 4ab9be5..dba6e39 100644
--- a/src/tests/cli/SecurityUtil/DummyAuthorization3N.cs
+++ b/src/tests/cli/SecurityUtil/DummyAuthorization3N.cs
@@ -19,7 +19,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace Apache.Geode.Client.Tests.NewAPI
+namespace Apache.Geode.Client.Tests
 {
   using Apache.Geode.Client;
   public class DummyAuthorization3 : CredentialGenerator

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/SecurityUtil/LdapCredentialGeneratorN.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/SecurityUtil/LdapCredentialGeneratorN.cs 
b/src/tests/cli/SecurityUtil/LdapCredentialGeneratorN.cs
index e86a557..f6f8c5c 100644
--- a/src/tests/cli/SecurityUtil/LdapCredentialGeneratorN.cs
+++ b/src/tests/cli/SecurityUtil/LdapCredentialGeneratorN.cs
@@ -17,7 +17,7 @@
 
 using System;
 
-namespace Apache.Geode.Client.Tests.NewAPI
+namespace Apache.Geode.Client.Tests
 {
   using Apache.Geode.Templates.Cache.Security;
   using Apache.Geode.Client;

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/SecurityUtil/PKCSCredentialGeneratorN.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/SecurityUtil/PKCSCredentialGeneratorN.cs 
b/src/tests/cli/SecurityUtil/PKCSCredentialGeneratorN.cs
index dd42184..0d9cd7b 100644
--- a/src/tests/cli/SecurityUtil/PKCSCredentialGeneratorN.cs
+++ b/src/tests/cli/SecurityUtil/PKCSCredentialGeneratorN.cs
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-namespace Apache.Geode.Client.Tests.NewAPI
+namespace Apache.Geode.Client.Tests
 {
   using Apache.Geode.DUnitFramework;
   using Apache.Geode.Client;
@@ -29,7 +29,7 @@ namespace Apache.Geode.Client.Tests.NewAPI
     public const string KeyStorePasswordProp = "security-keystorepass";
     private const string UserPrefix = "gemfire";
     private bool IsMultiUserMode = false;
-    Apache.Geode.Client.Tests.NewAPI.PkcsAuthInit Pkcs = null;
+    Apache.Geode.Client.Tests.PkcsAuthInit Pkcs = null;
 
     public PKCSCredentialGenerator(bool isMultiUser)
     {

http://git-wip-us.apache.org/repos/asf/geode/blob/06c8a2cc/src/tests/cli/SecurityUtil/XmlAuthzCredentialGeneratorN.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/SecurityUtil/XmlAuthzCredentialGeneratorN.cs 
b/src/tests/cli/SecurityUtil/XmlAuthzCredentialGeneratorN.cs
index abdcb18..50f732e 100644
--- a/src/tests/cli/SecurityUtil/XmlAuthzCredentialGeneratorN.cs
+++ b/src/tests/cli/SecurityUtil/XmlAuthzCredentialGeneratorN.cs
@@ -18,7 +18,7 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace Apache.Geode.Client.Tests.NewAPI
+namespace Apache.Geode.Client.Tests
 {
   using Apache.Geode.DUnitFramework;
   using Apache.Geode.Templates.Cache.Security;

Reply via email to