diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/AbstractSymmetricEngine.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/AbstractSymmetricEngine.java
index 38302fbd6d..4b1733d574 100644
--- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/AbstractSymmetricEngine.java
+++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/AbstractSymmetricEngine.java
@@ -373,10 +373,12 @@ public String sendSQL(String nodeId, String catalogName, String schemaName, Stri
     }
 
     public RemoteNodeStatuses push() {
+        MDC.put("engineName", getEngineName());
         return pushService.pushData();
     }
 
     public void syncTriggers() {
+        MDC.put("engineName", getEngineName());        
         triggerRouterService.syncTriggers();
     }
 
@@ -385,14 +387,17 @@ public NodeStatus getNodeStatus() {
     }
 
     public RemoteNodeStatuses pull() {
+        MDC.put("engineName", getEngineName());        
         return pullService.pullData();
     }
 
     public void route() {
+        MDC.put("engineName", getEngineName());        
         routerService.routeData();
     }
 
     public void purge() {
+        MDC.put("engineName", getEngineName());        
         purgeService.purgeOutgoing();
         purgeService.purgeIncoming();
         purgeService.purgeDataGaps();
@@ -470,14 +475,17 @@ public boolean isConfigured() {
     }
 
     public void heartbeat(boolean force) {
+        MDC.put("engineName", getEngineName());        
         dataService.heartbeat(force);
     }
 
     public void openRegistration(String nodeGroupId, String externalId) {
+        MDC.put("engineName", getEngineName());        
         registrationService.openRegistration(nodeGroupId, externalId);
     }
 
     public void reOpenRegistration(String nodeId) {
+        MDC.put("engineName", getEngineName());        
         registrationService.reOpenRegistration(nodeId);
     }
 
diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/job/AbstractJob.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/job/AbstractJob.java
index 6a6014ce48..8a218d8970 100644
--- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/job/AbstractJob.java
+++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/job/AbstractJob.java
@@ -202,6 +202,7 @@ public boolean invoke(boolean force) {
      * This method is called from the job
      */
     public void run() {
+        MDC.put("engineName", engine != null ? engine.getEngineName() : "unknown");
         invoke(false);
     }
 
diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/load/ConfigurationChangedFilter.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/load/ConfigurationChangedFilter.java
index 010e53f6f1..34e52e0de0 100644
--- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/load/ConfigurationChangedFilter.java
+++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/load/ConfigurationChangedFilter.java
@@ -131,18 +131,18 @@ private boolean matchesTable(Table table, String tableSuffix) {
     public <R extends IDataReader, W extends IDataWriter> void batchCommitted(
             DataContext context) {
         if (context.get(CTX_KEY_FLUSH_CHANNELS_NEEDED) != null) {
-            log.info("ChannelFlushed");
+            log.info("Channels flushed because new channels came through the data loader");
             configurationService.reloadChannels();
         }
         if (context.get(CTX_KEY_RESYNC_NEEDED) != null
                 && parameterService.is(ParameterConstants.AUTO_SYNC_CONFIGURATION)
                 && parameterService.is(ParameterConstants.AUTO_SYNC_TRIGGERS)) {
-            log.info(".");
+            log.info("About to syncTriggers because new configuration came through the data loader");
             triggerRouterService.syncTriggers();
         }
         if (context.get(CTX_KEY_FLUSH_TRANSFORMS_NEEDED) != null
                 && parameterService.is(ParameterConstants.AUTO_SYNC_CONFIGURATION)) {
-            log.info(".");
+            log.info("About to refresh the cache of transformation because new configuration come through the data loader");
             transformService.resetCache();
         }
     }
diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/route/ConfigurationChangedDataRouter.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/route/ConfigurationChangedDataRouter.java
index dd0ccaa6c3..0c26e336e7 100644
--- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/route/ConfigurationChangedDataRouter.java
+++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/route/ConfigurationChangedDataRouter.java
@@ -93,7 +93,8 @@ public Set<String> routeToNodes(SimpleRouterContext routingContext, DataMetaData
         // if this is sym_node or sym_node_security determine which nodes it
         // goes to.
         if (tableMatches(dataMetaData, TableConstants.SYM_NODE)
-                || tableMatches(dataMetaData, TableConstants.SYM_NODE_SECURITY)) {
+                || tableMatches(dataMetaData, TableConstants.SYM_NODE_SECURITY) 
+                || tableMatches(dataMetaData, TableConstants.SYM_NODE_HOST)) {
 
             if (didNodeSecurityChangeForNodeInitialization(dataMetaData)) {
                 return null;
@@ -251,17 +252,17 @@ private boolean isLinked(String nodeIdInQuestion, Node nodeThatCouldBeRoutedTo,
     @Override
     public void contextCommitted(SimpleRouterContext routingContext) {
         if (routingContext.getContextCache().get(CTX_KEY_FLUSH_CHANNELS_NEEDED) != null) {
-            log.info("Channels flushed because new channels came through the dataloader");
+            log.info("Channels flushed because new channels came through the data router");
             configurationService.reloadChannels();
         }
         if (routingContext.getContextCache().get(CTX_KEY_RESYNC_NEEDED) != null
                 && parameterService.is(ParameterConstants.AUTO_SYNC_TRIGGERS)) {
-            log.info("About to syncTriggers because new configuration came through the dataloader");
+            log.info("About to syncTriggers because new configuration came through the data router");
             triggerRouterService.syncTriggers();
         }
         if (routingContext.getContextCache().get(CTX_KEY_FLUSH_TRANSFORMS_NEEDED) != null
                 && parameterService.is(ParameterConstants.AUTO_SYNC_CONFIGURATION)) {
-            log.info("About to refresh the cache of transformation because new configuration come through the dataloader");
+            log.info("About to refresh the cache of transformation because new configuration come through the data router");
             transformService.resetCache();
         }
     }
diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorService.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorService.java
index eeff8589c6..c289abfbaf 100644
--- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorService.java
+++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorService.java
@@ -319,7 +319,10 @@ public void extract(Node targetNode, IOutgoingTransport targetTransport,
         int batchesSentCount = 0;
 
         OutgoingBatch currentBatch = null;
+        
         try {
+            IDataWriter dataWriter = null;
+
             for (int i = 0; i < activeBatches.size(); i++) {
                 currentBatch = activeBatches.get(i);
 
@@ -382,7 +385,9 @@ public void extract(Node targetNode, IOutgoingTransport targetTransport,
                                 currentBatch.getBatchId());
                         if (extractedBatch != null) {
                             IDataReader dataReader = new ProtocolDataReader(extractedBatch);
-                            IDataWriter dataWriter = new ProtocolDataWriter(targetTransport.open());
+                            if (dataWriter == null) {
+                                dataWriter = new ProtocolDataWriter(targetTransport.open());
+                            }
                             new DataProcessor(dataReader, dataWriter).process();
                         }
 
diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/PurgeService.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/PurgeService.java
index 524acc1ed4..6be7e7fd50 100644
--- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/PurgeService.java
+++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/PurgeService.java
@@ -230,7 +230,7 @@ private int purgeByMinMax(long[] minMax, MinMaxDeleteSql identifier, Date retent
                 break;
             case STRANDED_DATA:
                 deleteSql = getSql("deleteStrandedData");
-                args = new Object[] { minId, maxId, cutoffTime, minId, maxId, minId, maxId };
+                args = new Object[] { minId, maxId, cutoffTime, minId, maxId };
                 break;
             }
 
@@ -274,7 +274,7 @@ private long purgeIncomingBatch(final Calendar time) {
                 getSql("selectIncomingBatchRangeSql"), new ISqlRowMapper<NodeBatchRange>() {
                     public NodeBatchRange mapRow(Row rs) {
                         return new NodeBatchRange(rs.getString("node_id"), rs
-                                .getLong("min_batch_id"), rs.getLong("max_batch_id"));
+                                .getLong("min_id"), rs.getLong("max_id"));
                     }
                 }, time.getTime());
         int incomingBatchesPurgedCount = purgeByNodeBatchRangeList(
diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/PurgeServiceSqlMap.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/PurgeServiceSqlMap.java
index 701926616d..2cfa1b903a 100644
--- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/PurgeServiceSqlMap.java
+++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/PurgeServiceSqlMap.java
@@ -8,20 +8,22 @@ public class PurgeServiceSqlMap extends AbstractSqlMap {
 
     public PurgeServiceSqlMap(IDatabasePlatform platform, Map<String, String> replacementTokens) { 
         super(platform, replacementTokens);
+        
+        // @formatter:off
 
         putSql("selectOutgoingBatchRangeSql" ,"" + 
 "select min(batch_id) as min_id, max(batch_id) as max_id from $(outgoing_batch) where                                           " + 
 "  create_time < ? and status in ('OK','IG') and batch_id < (select max(batch_id) from $(outgoing_batch))   " );
 
         putSql("deleteOutgoingBatchSql" ,"" + 
-"delete from $(outgoing_batch) where status in ('OK','IG') and batch_id between :MIN              " + 
-"  and :MAX and batch_id not in (select batch_id from $(data_event) where batch_id between :MIN   " + 
-"  and :MAX)                                                                                                 " );
+"delete from $(outgoing_batch) where status in ('OK','IG') and batch_id between ?           \n" + 
+"  and ? and batch_id not in (select batch_id from $(data_event) where batch_id between ?   \n" + 
+"  and ?)                                                                                   \n" );
 
         putSql("deleteDataEventSql" ,"" + 
-"delete from $(data_event) where batch_id not in (select batch_id from                     " + 
-"  $(outgoing_batch) where batch_id between :MIN and :MAX and status not in ('OK','IG'))   " + 
-"  and batch_id between :MIN and :MAX                                                                 " );
+"delete from $(data_event) where batch_id not in (select batch_id from               \n" + 
+"  $(outgoing_batch) where batch_id between ? and ? and status not in ('OK','IG'))   \n" + 
+"  and batch_id between ? and ?                                                      \n" );
 
         putSql("deleteUnroutedDataEventSql" ,"" + 
 "delete from $(data_event) where           " + 
@@ -35,27 +37,27 @@ public PurgeServiceSqlMap(IDatabasePlatform platform, Map<String, String> replac
 "  in (select node_id from $(node) where sync_enabled=1) and status != 'OK'   " );
 
         putSql("deleteStrandedData" ,"" + 
-"delete from $(data) where                                       " + 
-"  data_id between :MIN and :MAX and                                        " + 
-"  data_id < (select max(ref_data_id) from $(data)_ref) and      " + 
-"  create_time < :CUTOFF_TIME and                                           " + 
-"  data_id not in (select e.data_id from $(data_event) e where   " + 
-"  e.data_id between :MIN and :MAX)                                         " );
+"delete from $(data) where                                       \n" + 
+"  data_id between ? and ? and                                   \n" + 
+"  data_id < (select min(start_id) from sym_data_gap) and      \n" + 
+"  create_time < ? and                                           \n" + 
+"  data_id not in (select e.data_id from $(data_event) e where   \n" + 
+"  e.data_id between ? and ?)                                    \n" );
 
         putSql("deleteDataSql" ,"" + 
-"delete from $(data) where                                   " + 
-"  data_id between :MIN and :MAX and                                    " + 
-"  create_time < :CUTOFF_TIME and                                       " + 
-"  data_id in (select e.data_id from $(data_event) e where   " + 
-"  e.data_id between :MIN and :MAX)                                     " + 
-"  and                                                                  " + 
-"  data_id not in                                                       " + 
-"  (select e.data_id from $(data_event) e where              " + 
-"  e.data_id between :MIN and :MAX and                                  " + 
-"  (e.data_id is null or                                                " + 
-"  e.batch_id in                                                        " + 
-"  (select batch_id from $(outgoing_batch) where             " + 
-"  status not in ('OK','IG'))))                                         " );
+"delete from $(data) where                                       \n" + 
+"  data_id between ? and ? and                                   \n" + 
+"  create_time < ? and                                           \n" + 
+"  data_id in (select e.data_id from $(data_event) e where       \n" + 
+"  e.data_id between ? and ?)                                    \n" + 
+"  and                                                           \n" + 
+"  data_id not in                                                \n" + 
+"  (select e.data_id from $(data_event) e where                  \n" + 
+"  e.data_id between ? and ? and                                 \n" + 
+"  (e.data_id is null or                                         \n" + 
+"  e.batch_id in                                                 \n" + 
+"  (select batch_id from $(outgoing_batch) where                 \n" + 
+"  status not in ('OK','IG'))))                                  \n" );
 
         putSql("selectIncomingBatchRangeSql" ,"" + 
 "select node_id, min(batch_id) as min_id, max(batch_id) as max_id from $(incoming_batch) where   " + 
diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/TriggerRouterService.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/TriggerRouterService.java
index ba3cff18c9..43bd3eae84 100644
--- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/TriggerRouterService.java
+++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/TriggerRouterService.java
@@ -120,6 +120,7 @@ public TriggerRouterService(IParameterService parameterService,
         configTables.add(TableConstants.getTableName(tablePrefix,
                 TableConstants.SYM_NODE_GROUP_LINK));
         configTables.add(TableConstants.getTableName(tablePrefix, TableConstants.SYM_NODE));
+        configTables.add(TableConstants.getTableName(tablePrefix, TableConstants.SYM_NODE_HOST));
         configTables
                 .add(TableConstants.getTableName(tablePrefix, TableConstants.SYM_NODE_SECURITY));
         configTables.add(TableConstants.getTableName(tablePrefix, TableConstants.SYM_PARAMETER));
@@ -414,16 +415,12 @@ protected boolean isMatch(String catalogName, String schemaName, String tableNam
      */
     protected List<TriggerRouter> getConfigurationTablesTriggerRoutersForCurrentNode(
             String sourceNodeGroupId) {
-        List<TriggerRouter> triggers = new ArrayList<TriggerRouter>();
+        List<TriggerRouter> triggerRouters = new ArrayList<TriggerRouter>();
         List<NodeGroupLink> links = configurationService.getNodeGroupLinksFor(sourceNodeGroupId);
         for (NodeGroupLink nodeGroupLink : links) {
-            triggers.addAll(buildTriggerRoutersForSymmetricTables(Version.version(), nodeGroupLink));
-            if (NodeGroupLinkAction.P == nodeGroupLink.getDataEventAction()) {                
-                triggers.add(buildTriggerRoutersForSymmetricTables(Version.version(), 
-                        buildTriggerForSymmetricTable(TableConstants.getTableName(tablePrefix, TableConstants.SYM_NODE_HOST)), nodeGroupLink));
-            }
+            triggerRouters.addAll(buildTriggerRoutersForSymmetricTables(Version.version(), nodeGroupLink));
         }
-        return triggers;
+        return triggerRouters;
     }
 
     protected void mergeInConfigurationTablesTriggerRoutersForCurrentNode(String sourceNodeGroupId,
diff --git a/symmetric/symmetric-core/src/test/resources/log4j.xml b/symmetric/symmetric-core/src/test/resources/log4j.xml
index 72867a6814..2a8ad5fa03 100644
--- a/symmetric/symmetric-core/src/test/resources/log4j.xml
+++ b/symmetric/symmetric-core/src/test/resources/log4j.xml
@@ -12,6 +12,10 @@
     <category name="org.jumpmind">
         <priority value="INFO" />
     </category>
+    
+    <category name="org.junit">
+        <priority value="DEBUG" />
+    </category>    
         
     <!-- 
     <category name="org.jumpmind.symmetric.io.data.writer">
diff --git a/symmetric/symmetric-jdbc/src/test/resources/db-test.properties b/symmetric/symmetric-jdbc/src/test/resources/db-test.properties
index 05c6f41f06..0990022fe4 100644
--- a/symmetric/symmetric-jdbc/src/test/resources/db-test.properties
+++ b/symmetric/symmetric-jdbc/src/test/resources/db-test.properties
@@ -1,4 +1,4 @@
-test.root=firebird
+test.root=h2
 test.client=h2
 
 mysql.db.driver=com.mysql.jdbc.Driver
diff --git a/symmetric/symmetric-server/src/test/java/TestArrayProc.java b/symmetric/symmetric-server/src/test/java/TestArrayProc.java
new file mode 100644
index 0000000000..91f8a66ee3
--- /dev/null
+++ b/symmetric/symmetric-server/src/test/java/TestArrayProc.java
@@ -0,0 +1,91 @@
+import oracle.jdbc.*;
+import oracle.sql.ArrayDescriptor;
+import oracle.sql.ARRAY;
+import oracle.jdbc.OracleTypes;
+import java.sql.*;
+
+public class TestArrayProc {
+
+    public static void main(String[] args)
+    throws ClassNotFoundException, SQLException
+    {
+        long ts = System.currentTimeMillis();
+        DriverManager.registerDriver (new oracle.jdbc.OracleDriver());
+
+        String url = "jdbc:oracle:thin:@//localhost:1521/XE";
+
+        Connection conn =
+        DriverManager.getConnection(url,"SampleRoot","admin");
+
+        conn.setAutoCommit(false);
+
+        // Create descriptors for each Oracle collection type required
+        ArrayDescriptor oracleVarchar2Collection =
+            ArrayDescriptor.createDescriptor("VARCHAR2_T",conn);
+
+        ArrayDescriptor oracleIntegerCollection =
+            ArrayDescriptor.createDescriptor("INTEGER_T",conn);
+
+        ArrayDescriptor oracleNumberCollection =
+            ArrayDescriptor.createDescriptor("NUMBER_T",conn);
+
+        CallableStatement stmt = 
+            conn.prepareCall("{ call insert_payments_a(?, ?, ?, ?, ?, ? ) }"); 
+
+        int INSERT_COUNT = 100000;
+        // JAVA arrays to hold the data.
+        double[] payment_amount_array = new double[INSERT_COUNT];
+        String[] card_number_array    = new String[INSERT_COUNT];
+        String[] expire_month_array   = new String[INSERT_COUNT];
+        String[] expire_year_array    = new String[INSERT_COUNT];
+        String[] name_on_card_array   = new String[INSERT_COUNT];
+
+        // Fill the Java arrays.
+        for (int i=0; i< INSERT_COUNT; i++) {
+            payment_amount_array[i]    = 99.99;
+            card_number_array[i]       = "1234567890123456";
+            expire_month_array[i]      = "12";
+            expire_year_array[i]       = "15";
+            name_on_card_array[i]     = "Mr S ODONNELL";
+        }
+
+        payment_amount_array[50] = 1001.00;
+
+        // Cast the Java arrays into Oracle arrays
+        ARRAY ora_payment_amount = new ARRAY (oracleNumberCollection,   conn, payment_amount_array);
+        ARRAY ora_card_number    = new ARRAY (oracleVarchar2Collection, conn, card_number_array);
+        ARRAY ora_expire_month   = new ARRAY (oracleVarchar2Collection, conn, expire_month_array);
+        ARRAY ora_expire_year    = new ARRAY (oracleVarchar2Collection, conn, expire_year_array);
+        ARRAY ora_name_on_card   = new ARRAY (oracleVarchar2Collection, conn, name_on_card_array);
+
+        // Bind the input arrays.
+        stmt.setObject(1, ora_payment_amount);
+        stmt.setObject(2, ora_card_number);
+        stmt.setObject(3, ora_expire_month);
+        stmt.setObject(4, ora_expire_year);
+        stmt.setObject(5, ora_name_on_card);
+
+        // Bind the output array, this will contain any exception indexes.
+        stmt.registerOutParameter(6, OracleTypes.ARRAY, "INTEGER_T");
+
+        stmt.execute();
+
+        // Get any exceptions. Remember Oracle arrays index from 1,
+        // so all indexes are +1 off.
+        int[] errors = new int[100];
+        ARRAY ora_errors = ((OracleCallableStatement)stmt).getARRAY(6);
+        // cast the oracle array back to a Java array
+        // Remember, Oracle arrays are indexed from 1, while Java is indexed from zero
+        // Any array indexes returned as failures from Oracle need to have 1 subtracted from them
+        // to reference the correct Java array element!
+        errors = ora_errors.getIntArray();
+        System.out.println(errors.length);
+        for (int i : errors) {
+            System.out.println("error:"+i);
+        }
+        conn.commit();
+        
+        ts = System.currentTimeMillis() -ts;
+        System.err.println("It took " + ts + "ms to insert " + INSERT_COUNT + " rows at " + ((double)ts/(double)INSERT_COUNT) + "ms/row");
+    }
+}
\ No newline at end of file
diff --git a/symmetric/symmetric-server/src/test/java/org/jumpmind/symmetric/test/SimpleIntegrationTest.java b/symmetric/symmetric-server/src/test/java/org/jumpmind/symmetric/test/SimpleIntegrationTest.java
index 53976e447b..3bf96cba80 100644
--- a/symmetric/symmetric-server/src/test/java/org/jumpmind/symmetric/test/SimpleIntegrationTest.java
+++ b/symmetric/symmetric-server/src/test/java/org/jumpmind/symmetric/test/SimpleIntegrationTest.java
@@ -1,6 +1,7 @@
 package org.jumpmind.symmetric.test;
 
 import java.math.BigDecimal;
+import java.sql.Timestamp;
 import java.sql.Types;
 import java.util.Date;
 
@@ -256,10 +257,13 @@ public void testEmptyNullLob() {
                     clientTestService.getCustomerIcon(300));
         }
 
-        Table table =  getServer().getSymmetricDialect().getPlatform().getTableFromCache("test_customer", false);
+        Table table = getServer().getSymmetricDialect().getPlatform()
+                .getTableFromCache("test_customer", false);
         // Test null large object
-        serverTestService.updateCustomer(300, "notes", null, table.getColumnWithName("notes").getTypeCode());
-        serverTestService.updateCustomer(300, "icon", null, table.getColumnWithName("icon").getTypeCode());
+        serverTestService.updateCustomer(300, "notes", null, table.getColumnWithName("notes")
+                .getTypeCode());
+        serverTestService.updateCustomer(300, "icon", null, table.getColumnWithName("icon")
+                .getTypeCode());
 
         clientPull();
 
@@ -781,179 +785,155 @@ public void syncUpdateCondition() {
 
     }
 
-    //
-    // @Test(timeout = 120000)
-    // public void ignoreNodeChannel() {
-    // logTestRunning();
-    // INodeService rootNodeService = (INodeService)
-    // AppUtils.find(Constants.NODE_SERVICE,
-    // getRootEngine());
-    // IConfigurationService rootConfigService = (IConfigurationService)
-    // getRootEngine()
-    // .getConfigurationService();
-    // rootNodeService.ignoreNodeChannelForExternalId(true,
-    // TestConstants.TEST_CHANNEL_ID,
-    // TestConstants.TEST_ROOT_NODE_GROUP, TestConstants.TEST_ROOT_EXTERNAL_ID);
-    // rootConfigService.reloadChannels();
-    //
-    // NodeChannel channel =
-    // rootConfigService.getNodeChannel(TestConstants.TEST_CHANNEL_ID,
-    // TestConstants.TEST_ROOT_EXTERNAL_ID, false);
-    // Assert.assertNotNull(channel);
-    // Assert.assertTrue(channel.isIgnoreEnabled());
-    // Assert.assertFalse(channel.isSuspendEnabled());
-    //
-    // getServer().getSqlTemplate().update(insertCustomerSql, new Object[] {
-    // 201,
-    // "Charlie Dude", "1",
-    // "300 Grub Street", "New Yorl", "NY", 90009, new Date(), new Date(),
-    // THIS_IS_A_TEST,
-    // BINARY_DATA });
-    // clientPull();
-    // assertEquals(
-    // getClient().getSqlTemplate()
-    // .queryForInt("select count(*) from test_customer where customer_id=201"),
-    // 0, "The customer was sync'd to the client.");
-    // rootNodeService.ignoreNodeChannelForExternalId(false,
-    // TestConstants.TEST_CHANNEL_ID,
-    // TestConstants.TEST_ROOT_NODE_GROUP, TestConstants.TEST_ROOT_EXTERNAL_ID);
-    // rootConfigService.reloadChannels();
-    //
-    // clientPull();
-    // getClient().getConfigurationService().reloadChannels();
-    // }
-    //
-    // @Test(timeout = 120000)
-    // public void syncUpdateWithEmptyKey() {
-    // logTestRunning();
-    // try {
-    // if (getClientDbDialect().isEmptyStringNulled()) {
-    // return;
-    // }
-    //
-    // getClient().getSqlTemplate().update(insertStoreStatusSql, new Object[] {
-    // "00001",
-    // "", 1 });
-    // clientPush();
-    //
-    // getClient().getSqlTemplate().update(updateStoreStatusSql, new Object[] {
-    // 2,
-    // "00001", "" });
-    // clientPush();
-    //
-    // int status =
-    // getServer().getSqlTemplate().queryForInt(selectStoreStatusSql, new
-    // Object[] { "00001",
-    // "   " });
-    // assertEquals(status, 2, "Wrong store status");
-    // } finally {
-    // logTestComplete();
-    // }
-    // }
-    //
-    // @Test(timeout = 120000)
-    // public void testPurge() throws Exception {
-    // logTestRunning();
-    //
-    // // do an extra push & pull to make sure we have events cleared out
-    // clientPull();
-    // clientPush();
-    //
-    // Thread.sleep(2000);
-    //
-    // IParameterService parameterService =
-    // AppUtils.find(Constants.PARAMETER_SERVICE,
-    // getRootEngine());
-    // int purgeRetentionMinues = parameterService
-    // .getInt(ParameterConstants.PURGE_RETENTION_MINUTES);
-    // // set purge in the future just in case the database time is different
-    // // than the current time
-    // parameterService.saveParameter(ParameterConstants.PURGE_RETENTION_MINUTES,
-    // -60 * 24);
-    //
-    // int beforePurge =
-    // getServer().getSqlTemplate().queryForInt("select count(*) from sym_data");
-    // getRootEngine().purge();
-    // int afterPurge =
-    // getServer().getSqlTemplate().queryForInt("select count(*) from sym_data");
-    // Timestamp maxCreateTime = (Timestamp)
-    // getServer().getSqlTemplate().queryForObject(
-    // "select max(create_time) from sym_data", Timestamp.class);
-    // Timestamp minCreateTime = (Timestamp)
-    // getServer().getSqlTemplate().queryForObject(
-    // "select min(create_time) from sym_data", Timestamp.class);
-    // Assert.assertTrue("Expected data rows to have been purged at the root.  There were "
-    // + beforePurge + " row before anf " + afterPurge
-    // + " rows after. The max create_time in sym_data was " + maxCreateTime
-    // + " and the min create_time in sym_data was " + minCreateTime
-    // + " and the current time of the server is " + new Date(),
-    // (beforePurge - afterPurge) > 0);
-    //
-    // parameterService.saveParameter(ParameterConstants.PURGE_RETENTION_MINUTES,
-    // purgeRetentionMinues);
-    //
-    // parameterService = AppUtils.find(Constants.PARAMETER_SERVICE,
-    // getClient());
-    // purgeRetentionMinues =
-    // parameterService.getInt(ParameterConstants.PURGE_RETENTION_MINUTES);
-    // // set purge in the future just in case the database time is different
-    // // than the current time
-    // parameterService.saveParameter(ParameterConstants.PURGE_RETENTION_MINUTES,
-    // -60 * 24);
-    //
-    // beforePurge =
-    // getClient().getSqlTemplate().queryForInt("select count(*) from sym_data");
-    // getClient().purge();
-    // afterPurge =
-    // getClient().getSqlTemplate().queryForInt("select count(*) from sym_data");
-    // maxCreateTime = (Timestamp) getClient().getSqlTemplate().queryForObject(
-    // "select max(create_time) from sym_data", Timestamp.class);
-    // minCreateTime = (Timestamp) getClient().getSqlTemplate().queryForObject(
-    // "select min(create_time) from sym_data", Timestamp.class);
-    // Assert.assertTrue("Expected data rows to have been purged at the client.  There were "
-    // + beforePurge + " row before anf " + afterPurge
-    // + " rows after. . The max create_time in sym_data was " + maxCreateTime
-    // + " and the min create_time in sym_data was " + minCreateTime
-    // + " and the current time of the server is " + new Date(),
-    // (beforePurge - afterPurge) > 0);
-    //
-    // parameterService.saveParameter(ParameterConstants.PURGE_RETENTION_MINUTES,
-    // purgeRetentionMinues);
-    // }
-    //
-    // @Test(timeout = 120000)
-    // public void testHeartbeat() throws Exception {
-    // logTestRunning();
-    // final String checkHeartbeatSql =
-    // "select heartbeat_time from sym_node where external_id='"
-    // + TestConstants.TEST_CLIENT_EXTERNAL_ID + "'";
-    // Date clientHeartbeatTimeBefore =
-    // getClient().getSqlTemplate().queryForObject(checkHeartbeatSql,
-    // Timestamp.class);
-    // Thread.sleep(1000);
-    // getClient().heartbeat(true);
-    // Date clientHeartbeatTimeAfter =
-    // getClient().getSqlTemplate().queryForObject(checkHeartbeatSql,
-    // Timestamp.class);
-    // Assert.assertNotSame("The heartbeat time was not updated at the client",
-    // clientHeartbeatTimeAfter, clientHeartbeatTimeBefore);
-    // Date rootHeartbeatTimeBefore =
-    // getServer().getSqlTemplate().queryForObject(checkHeartbeatSql,
-    // Timestamp.class);
-    // Assert.assertNotSame(
-    // "The root heartbeat time should not be the same as the updated client heartbeat time",
-    // clientHeartbeatTimeAfter, rootHeartbeatTimeBefore);
-    // while (clientPush()) {
-    // // continue to push while there data to push
-    // }
-    // Date rootHeartbeatTimeAfter =
-    // getServer().getSqlTemplate().queryForObject(checkHeartbeatSql,
-    // Timestamp.class);
-    // Assert.assertEquals(
-    // "The client heartbeat time should have been the same as the root heartbeat time.",
-    // clientHeartbeatTimeAfter, rootHeartbeatTimeAfter);
-    // }
-    //
+    @Test(timeout = 120000)
+    public void ignoreNodeChannel() {
+        logTestRunning();
+        INodeService rootNodeService = getServer().getNodeService();
+        IConfigurationService rootConfigService = getServer().getConfigurationService();
+        rootNodeService.ignoreNodeChannelForExternalId(true, TestConstants.TEST_CHANNEL_ID,
+                TestConstants.TEST_ROOT_NODE_GROUP, TestConstants.TEST_ROOT_EXTERNAL_ID);
+        rootConfigService.reloadChannels();
+
+        NodeChannel channel = rootConfigService.getNodeChannel(TestConstants.TEST_CHANNEL_ID,
+                TestConstants.TEST_ROOT_EXTERNAL_ID, false);
+        Assert.assertNotNull(channel);
+        Assert.assertTrue(channel.isIgnoreEnabled());
+        Assert.assertFalse(channel.isSuspendEnabled());
+
+        Customer customer = new Customer(201, "Charlie Dude", true, "300 Grub Street", "New York",
+                "NY", 90009, new Date(), new Date(), THIS_IS_A_TEST, BINARY_DATA);
+        serverTestService.insertCustomer(customer);
+        clientPull();
+
+        Assert.assertNull(clientTestService.getCustomer(customer.getCustomerId()));
+
+        rootNodeService.ignoreNodeChannelForExternalId(false, TestConstants.TEST_CHANNEL_ID,
+                TestConstants.TEST_ROOT_NODE_GROUP, TestConstants.TEST_ROOT_EXTERNAL_ID);
+
+        rootConfigService.reloadChannels();
+
+        clientPull();
+
+        Assert.assertNull(clientTestService.getCustomer(customer.getCustomerId()));
+
+        getClient().getConfigurationService().reloadChannels();
+
+    }
+
+    @Test(timeout = 120000)
+    public void syncUpdateWithEmptyKey() {
+        logTestRunning();
+        try {
+            if (getClient().getSymmetricDialect().getPlatform().getPlatformInfo()
+                    .isEmptyStringNulled()) {
+                return;
+            }
+
+            getClient().getSqlTemplate().update(insertStoreStatusSql,
+                    new Object[] { "00001", "", 1 });
+            clientPush();
+
+            getClient().getSqlTemplate().update(updateStoreStatusSql,
+                    new Object[] { 2, "00001", "" });
+            clientPush();
+
+            int status = getServer().getSqlTemplate().queryForInt(selectStoreStatusSql,
+                    new Object[] { "00001", "   " });
+
+            Assert.assertEquals("Wrong store status", 2, status);
+        } finally {
+            logTestComplete();
+        }
+    }
+
+    //@Test(timeout = 120000)
+    public void testPurge() throws Exception {
+        logTestRunning();
+
+        // do an extra push & pull to make sure we have events cleared out
+        clientPull();
+        clientPush();
+
+        Thread.sleep(2000);
+
+        IParameterService parameterService = getServer().getParameterService();
+        int purgeRetentionMinues = parameterService
+                .getInt(ParameterConstants.PURGE_RETENTION_MINUTES);
+
+        // set purge in the future just in case the database time is different
+        // than the current time
+        parameterService.saveParameter(ParameterConstants.PURGE_RETENTION_MINUTES, -60 * 24);
+
+        int beforePurge = getServer().getSqlTemplate().queryForInt("select count(*) from sym_data");
+        getServer().purge();
+        int afterPurge = getServer().getSqlTemplate().queryForInt("select count(*) from sym_data");
+        Timestamp maxCreateTime = (Timestamp) getServer().getSqlTemplate().queryForObject(
+                "select max(create_time) from sym_data", Timestamp.class);
+        Timestamp minCreateTime = (Timestamp) getServer().getSqlTemplate().queryForObject(
+                "select min(create_time) from sym_data", Timestamp.class);
+        Assert.assertTrue("Expected data rows to have been purged at the root.  There were "
+                + beforePurge + " row before and " + afterPurge
+                + " rows after. The max create_time in sym_data was " + maxCreateTime
+                + " and the min create_time in sym_data was " + minCreateTime
+                + " and the current time of the server is " + new Date(),
+                (beforePurge - afterPurge) > 0);
+
+        parameterService.saveParameter(ParameterConstants.PURGE_RETENTION_MINUTES,
+                purgeRetentionMinues);
+
+        parameterService = getClient().getParameterService();
+        purgeRetentionMinues = parameterService.getInt(ParameterConstants.PURGE_RETENTION_MINUTES);
+        // set purge in the future just in case the database time is different
+        // than the current time
+        parameterService.saveParameter(ParameterConstants.PURGE_RETENTION_MINUTES, -60 * 24);
+
+        beforePurge = getClient().getSqlTemplate().queryForInt("select count(*) from sym_data");
+        getClient().purge();
+        afterPurge = getClient().getSqlTemplate().queryForInt("select count(*) from sym_data");
+        maxCreateTime = (Timestamp) getClient().getSqlTemplate().queryForObject(
+                "select max(create_time) from sym_data", Timestamp.class);
+        minCreateTime = (Timestamp) getClient().getSqlTemplate().queryForObject(
+                "select min(create_time) from sym_data", Timestamp.class);
+        Assert.assertTrue("Expected data rows to have been purged at the client.  There were "
+                + beforePurge + " row before anf " + afterPurge
+                + " rows after. . The max create_time in sym_data was " + maxCreateTime
+                + " and the min create_time in sym_data was " + minCreateTime
+                + " and the current time of the server is " + new Date(),
+                (beforePurge - afterPurge) > 0);
+
+        parameterService.saveParameter(ParameterConstants.PURGE_RETENTION_MINUTES,
+                purgeRetentionMinues);
+    }
+
+    @Test//(timeout = 120000)
+    public void testHeartbeat() throws Exception {
+        logTestRunning();
+        final String checkHeartbeatSql = "select heartbeat_time from sym_node where external_id='"
+                + TestConstants.TEST_CLIENT_EXTERNAL_ID + "'";
+        Date clientHeartbeatTimeBefore = getClient().getSqlTemplate().queryForObject(
+                checkHeartbeatSql, Timestamp.class);
+        Thread.sleep(1000);
+        getClient().heartbeat(true);
+        Date clientHeartbeatTimeAfter = getClient().getSqlTemplate().queryForObject(
+                checkHeartbeatSql, Timestamp.class);
+        Assert.assertNotSame("The heartbeat time was not updated at the client",
+                clientHeartbeatTimeAfter, clientHeartbeatTimeBefore);
+        Date rootHeartbeatTimeBefore = getServer().getSqlTemplate().queryForObject(
+                checkHeartbeatSql, Timestamp.class);
+        Assert.assertNotSame(
+                "The root heartbeat time should not be the same as the updated client heartbeat time",
+                clientHeartbeatTimeAfter, rootHeartbeatTimeBefore);
+        while (clientPush()) {
+            // continue to push while there data to push
+            Thread.sleep(1000);
+        }
+        Date rootHeartbeatTimeAfter = getServer().getSqlTemplate().queryForObject(
+                checkHeartbeatSql, Timestamp.class);
+        Assert.assertEquals(
+                "The client heartbeat time should have been the same as the root heartbeat time.",
+                clientHeartbeatTimeAfter, rootHeartbeatTimeAfter);
+    }
+
     // @Test(timeout = 120000)
     // public void testVirtualTransactionId() {
     // logTestRunning();