From 8c7c02ee8f73c0ba104310beb8928441d6bf4a35 Mon Sep 17 00:00:00 2001
From: Sumedh Wale <sumwale@gmail.com>
Date: Sat, 26 Jun 2021 09:01:49 +0530
Subject: [PATCH] Remove GemFire connector (#1561)

For the opensource snappy-connectors repository, the gemfire-connector module
still depends on the closed-source Pivotal's Gemfire jar, so removed those references.

It can be added back in future if the code in snappy-connectors repository is
modified to support Apache Geode instead.

Also added OSS versions of snappy-aqp and snappy-connectors repositories as submodules.

Upgraded gradle to v5.6.4, the latest 5.x release.

Fixed multiple test failures.

Also moved common test cluster start/stop etc to new class ClusterUtils that also
creates a separate directory for cluster instead of using the main snappy product directory

Updated NOTICE, build.

- fix snappy-nodes.sh script to work uniformly for both local and remote execution
- updated year in LICENSE
- also fixed occasional bulk write lock timeout
- updated submodule links
---
 .gitignore                                    |   3 -
 .gitmodules                                   |   7 +-
 LICENSE                                       |   4 +-
 NOTICE                                        |  11 +-
 aqp                                           |   1 +
 build.gradle                                  | 389 ++++++++++--------
 cluster/bin/snappy                            |   4 +-
 cluster/build.gradle                          |  31 +-
 cluster/sbin/snappy-nodes.sh                  |   2 +-
 .../cluster/ClusterManagerTestBase.scala      |  15 +-
 .../cluster/PrimaryDUnitRecoveryTest.scala    | 134 ++----
 .../SnappyMetricsSystemDUnitTest.scala        |  85 ++--
 .../cluster/SnappyRowStoreModeDUnit.scala     |  46 +--
 .../cluster/SplitSnappyClusterDUnitTest.scala | 211 +++++-----
 .../JDBCMetadataCaseDUnitTest.scala           |  45 +-
 .../JDBCPreparedStatementDUnitTest.scala      |  13 +-
 .../SnappyUnifiedMemoryManagerDUnitTest.scala |   8 +-
 ...ColumnBatchAndExternalTableDUnitTest.scala |  41 +-
 .../apache/spark/sql/NorthWindDUnitTest.scala |  23 +-
 .../spark/sql/SmartConnectorFunctions.scala   |  14 +-
 .../org/apache/spark/sql/TPCHDUnitTest.scala  |  15 +-
 .../memory/SnappyUnifiedMemoryManager.scala   |   1 +
 .../util/LocalDirectoryCleanupUtil.scala      |   4 +-
 .../benchmark/snappy/TPCDSSuite.scala         |   4 +-
 .../memory/MemoryManagerStatsSuite.scala      |   5 +-
 .../SnappyLocalIndexAccountingSuite.scala     |   4 +-
 .../memory/SnappyMemoryAccountingSuite.scala  |   6 +-
 .../memory/SnappyStorageEvictorSuite.scala    |   5 +-
 .../spark/sql/SQLFunctionsTestSuite.scala     |   7 +-
 .../execution/benchmark/StringBenchmark.scala |  13 +-
 .../spark/sql/store/SQLMetadataTest.scala     |   4 +-
 .../spark/sql/test/SnappySparkTestUtil.scala  |  12 +-
 core/build.gradle                             |  14 +-
 .../cluster/CassandraSnappyDUnitTest.scala    | 141 +++----
 .../io/snappydata/cluster/ClusterUtils.scala  | 240 +++++++++++
 .../cluster/SnappyJobTestSupport.scala        |  12 +-
 .../SplitClusterDUnitSecurityTest.scala       |  89 ++--
 .../cluster/SplitClusterDUnitTest.scala       | 101 ++---
 .../cluster/SplitClusterDUnitTestBase.scala   |  85 ++--
 .../SnappySinkProviderDUnitTest.scala         |  89 +---
 .../org/apache/spark/sql/SnappySession.scala  |   6 +-
 .../columnar/impl/ColumnFormatRelation.scala  |  33 +-
 .../io/snappydata/CommandLineToolsSuite.scala |   2 +-
 .../io/snappydata/ConcurrentOpsTests.scala    |  34 +-
 .../scala/io/snappydata/SnappyFunSuite.scala  |   5 +-
 .../apache/spark/sql/store/MetadataTest.scala |  16 +-
 ...tication_connecting_to_a_secure_cluster.md |   2 +-
 dtests/build.gradle                           | 190 ++++-----
 .../SnappyDeployUnDeployTest.java             |   4 +-
 .../hydra/deployPkgUDF/deployPkgUDF.bt        |   2 +-
 .../hydra/SnappyHydraTestRunner.scala         |   8 +-
 .../io/snappydata/hydra/SnappyTestUtils.scala |  48 ++-
 .../hydra/northwind/NWTestUtil.scala          |  16 +-
 .../test/dunit/DistributedTestBase.java       |   4 +
 .../test/dunit/standalone/DUnitLauncher.java  |   3 +-
 .../io/snappydata/SnappyTestRunner.scala      |   6 +-
 gradle/wrapper/gradle-wrapper.jar             | Bin 55741 -> 55616 bytes
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 gradlew                                       |  20 +-
 gradlew.bat                                   |  16 +
 .../spark/sql/SnappyDataPoolDialect.scala     |  13 +-
 .../io/snappydata/tools/QuickLauncher.java    |  15 +-
 mkdocs.yml                                    |   2 +-
 release/filehdr-mod.txt                       |   2 +-
 release/filehdr.txt                           |   2 +-
 release/preInstallDeb.sh                      |   2 +-
 release/preInstallRpm.sh                      |   2 +-
 release/replace-txt.sh                        |  48 ++-
 scalastyle-config.xml                         |   2 +-
 snappy-connectors                             |   1 +
 spark                                         |   2 +-
 spark-jobserver                               |   2 +-
 store                                         |   2 +-
 73 files changed, 1286 insertions(+), 1164 deletions(-)
 create mode 160000 aqp
 create mode 100644 core/src/dunit/scala/io/snappydata/cluster/ClusterUtils.scala
 create mode 160000 snappy-connectors

diff --git a/.gitignore b/.gitignore
index 754e6c88e1..530715a2b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,6 @@
 *.class
-aqp
-!core/**/aqp
 benchmarking/
 hydraLogs/
-snappy-connectors/
 snappy-poc/
 vm_*
 
diff --git a/.gitmodules b/.gitmodules
index 36a5d2fbca..d9e1b9e066 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,4 +10,9 @@
         path = spark
         url = https://github.com/TIBCOSoftware/snappy-spark.git
         branch = snappy/branch-2.1 
-
+[submodule "aqp"]
+	path = aqp
+	url = https://github.com/TIBCOSoftware/snappy-aqp.git
+[submodule "snappy-connectors"]
+	path = snappy-connectors
+	url = https://github.com/TIBCOSoftware/snappy-connectors.git
diff --git a/LICENSE b/LICENSE
index 749d0c69db..6abae0cb82 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2017-2020. TIBCO Software Inc.
+Copyright (c) 2017-2021. TIBCO Software Inc.
 
    Project SnappyData(TM) - Community Edition is licensed under the 
    Apache License, Version 2.0 (the "License"). You may not use the 
@@ -80534,4 +80534,4 @@ Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.
\ No newline at end of file
+limitations under the License.
diff --git a/NOTICE b/NOTICE
index d6cba4b41e..904d08e0e8 100644
--- a/NOTICE
+++ b/NOTICE
@@ -2,7 +2,7 @@ SnappyData OSS Edition
 Copyright 2018 and onwards SnappyData Inc.
 
 
-This is a comprehensive list of software libraries used by SnappyData in version 1.0.
+This is a comprehensive list of software libraries used by SnappyData in version 1.3.0.
 More details on license types, license versions, and contributors can be found further down in this file
 
 HikariCP-2.7.9.jar				Apache V2:	http://www.apache.org/licenses/LICENSE-2.0
@@ -186,6 +186,10 @@ libgemfirexd.dylib				Apache V2:	http://www.apache.org/licenses/LICENSE-2.0
 libgemfirexd.so					Apache V2:	http://www.apache.org/licenses/LICENSE-2.0
 libgemfirexd64.dylib				Apache V2:	http://www.apache.org/licenses/LICENSE-2.0
 libgemfirexd64.so				Apache V2:	http://www.apache.org/licenses/LICENSE-2.0
+libnative.dylib					Apache V2:	http://www.apache.org/licenses/LICENSE-2.0
+libnative.so					Apache V2:	http://www.apache.org/licenses/LICENSE-2.0
+libnative64.dylib				Apache V2:	http://www.apache.org/licenses/LICENSE-2.0
+libnative64.so					Apache V2:	http://www.apache.org/licenses/LICENSE-2.0
 libthrift-0.9.3.jar				Apache V2:	http://www.apache.org/licenses/LICENSE-2.0
 liquidFillGauge.js				BSD:		http://choosealicense.com/licenses/bsd-2-clause
 log4j-1.2.17.jar				Apache V2:	http://www.apache.org/licenses/LICENSE-2.0
@@ -259,6 +263,7 @@ snappy-spark-streaming_2.11-2.1.1.4.jar		Apache V2:	http://www.apache.org/licens
 snappy-spark-tags_2.11-2.1.1.4.jar		Apache V2:	http://www.apache.org/licenses/LICENSE-2.0
 snappy-spark-unsafe_2.11-2.1.1.4.jar		Apache V2:	http://www.apache.org/licenses/LICENSE-2.0
 snappy-spark-yarn_2.11-2.1.1.4.jar		Apache V2:	http://www.apache.org/licenses/LICENSE-2.0
+snappydata-aqp_2.11-1.0.2.1.jar			Apache V2:	http://www.apache.org/licenses/LICENSE-2.0
 snappydata-cluster_2.11-1.0.2.1.jar		Apache V2:	http://www.apache.org/licenses/LICENSE-2.0
 snappydata-core_2.11-1.0.2.1.jar		Apache V2:	http://www.apache.org/licenses/LICENSE-2.0
 snappydata-jdbc_2.11-1.0.2.1-only.jar		Apache V2:	http://www.apache.org/licenses/LICENSE-2.0
@@ -1005,7 +1010,7 @@ SECTION 1: BSD-STYLE, MIT-STYLE, OR SIMILAR STYLE LICENSES
 
 SECTION 2: Apache License, V2.0
 
-   >>> hadoop-common-2.7.3
+   >>> hadoop-common-2.7.7
    >>> swagger-ui-2.0.17
 
 
@@ -1175,7 +1180,7 @@ Copyright (C) 2006-2009 Dustin Sallings
 Apache License, V2.0 is applicable to the following component(s).
 
 
->>> hadoop-common-2.7.3
+>>> hadoop-common-2.7.7
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/aqp b/aqp
new file mode 160000
index 0000000000..7b7066b4ad
--- /dev/null
+++ b/aqp
@@ -0,0 +1 @@
+Subproject commit 7b7066b4ad0a474531d9df5566611bea5db4eed0
diff --git a/build.gradle b/build.gradle
index cf894fbbdd..58d33ad03e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,9 +24,9 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'io.snappydata:gradle-scalatest:0.23'
+    classpath 'io.snappydata:gradle-scalatest:0.25'
     classpath 'org.github.ngbinh.scalastyle:gradle-scalastyle-plugin_2.11:0.9.0'
-    classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.3'
+    classpath 'com.github.jengelman.gradle.plugins:shadow:5.2.0'
     classpath 'de.undercouch:gradle-download-task:3.4.3'
     classpath 'net.rdrei.android.buildtimetracker:gradle-plugin:0.11.+'
     classpath 'com.netflix.nebula:gradle-ospackage-plugin:5.2.+'
@@ -103,9 +103,9 @@ allprojects {
     scalaVersion = scalaBinaryVersion + '.8'
     sparkVersion = '2.1.1'
     snappySparkVersion = '2.1.1.9'
-    sparkDistName = "spark-${sparkVersion}-bin-hadoop3.2"
-    sparkCurrentVersion = '2.3.2'
-    sparkCurrentDistName = "spark-${sparkCurrentVersion}-bin-hadoop3.2"
+    sparkDistName = "spark-${sparkVersion}-bin-hadoop2.7"
+    sparkCurrentVersion = '2.4.8'
+    sparkCurrentDistName = "spark-${sparkCurrentVersion}-bin-hadoop2.7"
     log4jVersion = '1.2.17'
     slf4jVersion = '1.7.25'
     junitVersion = '4.12'
@@ -120,7 +120,7 @@ allprojects {
     guavaVersion = '14.0.1'
     kryoVersion = '4.0.1'
     thriftVersion = '0.9.3'
-    jacksonVersion = '2.9.5'
+    jacksonVersion = '2.9.9'
     hiveVersion = '1.21.2.3.1.2.1-1'
     metricsVersion = '4.0.3'
     metrics2Version = '2.2.0'
@@ -238,24 +238,38 @@ if (!hasJdbcConnectorProject) {
   throw new GradleException('Project JDBC Stream Connector inside repository snappy-connectors not found.')
 }
 
+// set python2 for pyspark if python3 version is an unsupported one
+String sparkPython = 'python'
+def checkResult = exec {
+  ignoreExitValue = true
+  commandLine 'sh', '-c', 'python --version | grep -Eq "( 3\\.[0-7])|( 2\\.)"'
+}
+if (checkResult.exitValue != 0) {
+  checkResult = exec {
+    ignoreExitValue = true
+    commandLine 'sh', '-c', 'python2 --version >/dev/null 2>&1'
+  }
+  if (checkResult.exitValue == 0) {
+    sparkPython = 'python2'
+  }
+}
 
-def getProcessId() {
+static def getProcessId() {
   String name = java.lang.management.ManagementFactory.getRuntimeMXBean().getName()
   return name[0..name.indexOf('@') - 1]
 }
 
-def getStackTrace(def t) {
+static def getStackTrace(def t) {
   java.io.StringWriter sw = new java.io.StringWriter()
   java.io.PrintWriter pw = new java.io.PrintWriter(sw)
   org.codehaus.groovy.runtime.StackTraceUtils.sanitize(t).printStackTrace(pw)
   return sw.toString()
 }
 
-// Skip snappy-spark, snappy-aqp and spark-jobserver that have their own
+// Skip snappy-spark and spark-jobserver that have their own
 // scalaStyle configuration. Skip snappy-store that will not use it.
 configure(subprojects.findAll {!(it.name ==~ /snappy-spark.*/ ||
       it.name ==~ /snappy-store.*/ ||
-      it.name ==~ /snappy-aqp.*/ ||
       it.name ==~ /spark-jobserver.*/)}) {
   scalaStyle {
     configLocation = "${rootProject.projectDir}/scalastyle-config.xml"
@@ -270,7 +284,7 @@ configure(subprojects.findAll {!(it.name ==~ /snappy-spark.*/ ||
   }
 }
 
-def cleanIntermediateFiles(def projectName) {
+def cleanIntermediateFiles(String projectName) {
   def projDir = "${project(projectName).projectDir}"
   delete "${projDir}/metastore_db"
   delete "${projDir}/warehouse"
@@ -280,7 +294,7 @@ def cleanIntermediateFiles(def projectName) {
   }
 }
 
-def now() {
+static def now() {
   return new Date().format('yyyy-MM-dd HH:mm:ss.SSS Z')
 }
 
@@ -329,8 +343,13 @@ task cleanQuickstart { doLast {
 } }
 
 subprojects {
+
+  int maxWorkers = project.hasProperty('org.gradle.workers.max') ?
+                   project.property('org.gradle.workers.max') as int :
+                   Runtime.getRuntime().availableProcessors()
+
   // the run task for a selected sub-project
-  task run(type:JavaExec) {
+  task run(type: JavaExec) {
     if (!project.hasProperty('mainClass')) {
       main = 'io.snappydata.app.SparkSQLTest'
     } else {
@@ -344,20 +363,19 @@ subprojects {
   }
 
   task scalaTest(type: Test) {
-    def factory = new com.github.maiflai.BackwardsCompatibleJavaExecActionFactory(gradle.gradleVersion)
-    actions = [ new com.github.maiflai.ScalaTestAction(factory) ]
+    actions = [ new com.github.maiflai.ScalaTestAction() ]
     // top-level default is single process run since scalatest does not
     // spawn separate JVMs
     maxParallelForks = 1
     minHeapSize '4g'
     maxHeapSize '4g'
     jvmArgs '-ea', '-XX:+HeapDumpOnOutOfMemoryError','-XX:+UseConcMarkSweepGC', '-XX:MaxNewSize=1g',
-            '-XX:+UseParNewGC', '-XX:+CMSClassUnloadingEnabled'
+            '-XX:+UseParNewGC', '-XX:+CMSClassUnloadingEnabled', '-Xss4m', '-XX:ReservedCodeCacheSize=1g'
     // for benchmarking
     // minHeapSize '12g'
     // maxHeapSize '12g'
     // jvmArgs '-XX:+HeapDumpOnOutOfMemoryError','-XX:+UseConcMarkSweepGC', '-XX:MaxNewSize=2g',
-    //        '-XX:+UseParNewGC', '-XX:+CMSClassUnloadingEnabled'
+    //        '-XX:+UseParNewGC', '-XX:+CMSClassUnloadingEnabled', '-Xss4m', '-XX:ReservedCodeCacheSize=1g'
 
     testLogging.exceptionFormat = TestExceptionFormat.FULL
     testLogging.events = TestLogEvent.values() as Set
@@ -393,8 +411,9 @@ subprojects {
     reports.html.destination = file("${workingDir}/html/${project.name}")
     reports.junitXml.destination = file(workingDir)
   }
+
   test {
-    maxParallelForks = Runtime.getRuntime().availableProcessors()
+    maxParallelForks = maxWorkers
     maxHeapSize '2g'
     jvmArgs '-ea', '-XX:+HeapDumpOnOutOfMemoryError','-XX:+UseConcMarkSweepGC',
             '-XX:+UseParNewGC', '-XX:+CMSClassUnloadingEnabled'
@@ -426,10 +445,55 @@ subprojects {
       progress << "${eol}${now} ========== STARTING JUNIT TEST SUITE FOR ${project.name} ==========${eol}${eol}"
     }
   }
+
+  task configureDUnitTest(dependsOn: testClasses) {
+    String dunitSingle = System.getProperty('dunit.single')
+    if (dunitSingle == null || dunitSingle.length() == 0) {
+      dunitSingle = rootProject.hasProperty('dunit.single') ?
+          rootProject.property('dunit.single') : null
+    }
+    doLast {
+      tasks.named('dunitTest').configure {
+        includes.clear()
+        excludes.clear()
+        if (dunitSingle == null || dunitSingle.length() == 0) {
+          def dunitTests = testClassesDirs.asFileTree.matching {
+            includes = [ '**/*DUnitTest.class', '**/*DUnit.class' ]
+            excludes = [
+                '**/*Suite.class', '**/*DUnitSecurityTest.class', '**/NCJ*DUnit.class', '**/*HDFS*DUnit*.class',
+                '**/BackwardCompatabilityPart*DUnit.class', '**/*Perf*DUnit.class', '**/ListAggDUnit.class',
+                '**/SingleHop*TransactionDUnit.class', '**/*Parallel*AsyncEvent*DUnit.class',
+                '**/pivotal/gemfirexd/wan/**/*DUnit.class', '**/*DUnitRecoveryTest.class'
+            ]
+          }
+          FileTree includeTestFiles = dunitTests
+          int dunitFrom = rootProject.hasProperty('dunit.from') ?
+              getLast(includeTestFiles, rootProject.property('dunit.from')) : 0
+          int dunitTo = rootProject.hasProperty('dunit.to') ?
+              getLast(includeTestFiles, rootProject.property('dunit.to')) : includeTestFiles.size()
+
+          int begin = dunitFrom != -1 ? dunitFrom : 0
+          int end = dunitTo != -1 ? dunitTo : includeTestFiles.size()
+          def filteredSet = includeTestFiles.drop(begin).take(end-begin+1).collect {f -> "**/" + f.name}
+          if (begin != 0 || end != includeTestFiles.size()) {
+            println("Picking DUNIT tests for ${project.path}")
+            filteredSet.each { a -> println(a) }
+          }
+          include filteredSet
+        } else {
+          include dunitSingle
+        }
+      }
+    }
+  }
+
   task dunitTest(type: Test) {
     dependsOn ':cleanDUnit'
     dependsOn ':product'
     dependsOn ':copyShadowJars'
+    dependsOn configureDUnitTest
+
+    // maxParallelForks = Math.max(Math.sqrt(maxWorkers + 1) + 1 as int, 2)
     maxParallelForks = 1
     minHeapSize '1536m'
     maxHeapSize '1536m'
@@ -481,10 +545,40 @@ subprojects {
     }
   }
 
+  task configureRecoveryTest(dependsOn: testClasses) {
+    String recoverySingle = System.getProperty('recovery.single')
+    if (recoverySingle == null || recoverySingle.length() == 0) {
+      recoverySingle = rootProject.hasProperty('recovery.single') ?
+          rootProject.property('recovery.single') : null
+    }
+    doLast {
+      tasks.named('recoveryTest').configure {
+        includes.clear()
+        excludes.clear()
+        if (recoverySingle == null || recoverySingle.length() == 0) {
+          def recoveryTests = testClassesDirs.asFileTree.matching {
+            includes = [ '**/*DUnitRecoveryTest.class' ]
+            excludes = [
+                '**/*Suite.class', '**/*DUnitSecurityTest.class', '**/NCJ*DUnit.class', '**/*HDFS*DUnit*.class',
+                '**/BackwardCompatabilityPart*DUnit.class', '**/*Perf*DUnit.class', '**/ListAggDUnit.class',
+                '**/SingleHop*TransactionDUnit.class', '**/*Parallel*AsyncEvent*DUnit.class',
+                '**/pivotal/gemfirexd/wan/**/*DUnit.class', '**/*DUnitTest.class', '**/*DUnit.class'
+            ]
+          }
+          FileTree includeTestFiles = recoveryTests
+          include includeTestFiles.collect {f -> "**/" + f.name}
+        } else {
+          include recoverySingle
+        }
+      }
+    }
+  }
+
   task recoveryTest(type: Test) {
     dependsOn ':cleanRecoveryTest'
     dependsOn ':product'
     dependsOn ':copyShadowJars'
+    dependsOn configureRecoveryTest
 
     maxParallelForks = 1
     minHeapSize '4g'
@@ -507,8 +601,8 @@ subprojects {
 
     workingDir = "${testResultsBase}/recoveryTest"
     systemProperties 'java.net.preferIPv4Stack': 'true',
-        'SNAPPY_HOME': snappyProductDir,
-        'RECOVERY_TEST_DIR': workingDir
+                     'SNAPPY_HOME': snappyProductDir,
+                     'RECOVERY_TEST_DIR': workingDir
 
     binResultsDir = file("${workingDir}/binary/${project.name}")
     reports.html.destination = file("${workingDir}/html/${project.name}")
@@ -537,10 +631,48 @@ subprojects {
     }
   }
 
+  task configureDUnitSecurityTest(dependsOn: testClasses) {
+    String dunitSecSingle = System.getProperty('dunitSecurity.single')
+    if (dunitSecSingle == null || dunitSecSingle.length() == 0) {
+      dunitSecSingle = rootProject.hasProperty('dunitSecurity.single') ?
+          rootProject.property('dunitSecurity.single') : null
+    }
+    doLast {
+      tasks.named('dunitSecurityTest').configure {
+        includes.clear()
+        excludes.clear()
+        if (dunitSecSingle == null || dunitSecSingle.length() == 0) {
+          def dunitSecurityTests = testClassesDirs.asFileTree.matching {
+            includes = [ '**/*DUnitSecurityTest.class' ]
+            excludes = [ '**/*Suite.class', '**/*DUnitTest.class', '**/*DUnit.class', '**/*DUnitRecoveryTest.class' ]
+          }
+          FileTree includeTestFiles = dunitSecurityTests
+          int dunitFrom = rootProject.hasProperty('dunitSecurity.from') ?
+              getLast(includeTestFiles, rootProject.property('dunitSecurity.from')) : 0
+          int dunitTo = rootProject.hasProperty('dunitSecurity.to') ?
+              getLast(includeTestFiles, rootProject.property('dunitSecurity.to')) : includeTestFiles.size()
+
+          int begin = dunitFrom != -1 ? dunitFrom : 0
+          int end = dunitTo != -1 ? dunitTo : includeTestFiles.size()
+          def filteredSet = includeTestFiles.drop(begin).take(end-begin+1).collect {f -> "**/" + f.name}
+          if (begin != 0 || end != includeTestFiles.size()) {
+            println("Picking SECURITY tests for ${project.path}")
+            filteredSet.each { a -> println(a) }
+          }
+          include filteredSet
+        } else {
+          include dunitSecSingle
+        }
+      }
+    }
+  }
+
   task dunitSecurityTest(type: Test) {
     dependsOn ':cleanSecurityDUnit'
     dependsOn ':product'
     dependsOn ':copyShadowJars'
+    dependsOn configureDUnitSecurityTest
+
     maxParallelForks = 1
     minHeapSize '1536m'
     maxHeapSize '1536m'
@@ -587,7 +719,7 @@ subprojects {
         'Manifest-Version'  : '1.0',
         'Created-By'        : createdBy,
         'Title'             : rootProject.name,
-        'Version'           : version,
+        'Version'           : archiveVersion.get(),
         'Vendor'            : vendorName
       )
     }
@@ -631,15 +763,17 @@ subprojects {
       "org.apache.hadoop:hadoop-yarn-server-web-proxy:${hadoopVersion}"
     exclude(group: 'org.mortbay.jetty', module: 'servlet-api')
   }
+  /*
   configurations.testRuntime {
     // below is included indirectly by hadoop deps and conflicts with embedded 1.5.7 apacheds
     exclude(group: 'org.apache.directory.server', module: 'apacheds-kerberos-codec')
     exclude(group: 'org.apache.directory.server', module: 'apacheds-i18n')
   }
+  */
 
   task packageTests(type: Jar, dependsOn: testClasses) {
     description 'Assembles a jar archive of test classes.'
-    classifier = 'tests'
+    archiveClassifier.set('tests')
   }
   artifacts {
     testOutput packageTests
@@ -660,11 +794,11 @@ subprojects {
   apply plugin: 'signing'
 
   task packageSources(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
+    archiveClassifier.set('sources')
     from sourceSets.main.allSource
   }
   task packageDocs(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
+    archiveClassifier.set('javadoc')
     from javadoc
   }
   if (rootProject.hasProperty('enablePublish')) {
@@ -688,8 +822,8 @@ subprojects {
             name 'SnappyData'
             packaging 'jar'
             // optionally artifactId can be defined here
-            description 'TIBCO ComputeDB distributed data store and execution engine'
-            url 'http://www.snappydata.io'
+            description 'SnappyData distributed data store and execution engine'
+            url 'https://github.com/TIBCOSoftware/snappydata'
 
             scm {
               connection 'scm:git:https://github.com/TIBCOSoftware/snappydata.git'
@@ -721,27 +855,12 @@ subprojects {
 // apply common test and misc configuration
 gradle.taskGraph.whenReady { graph ->
 
-  String dunitSingle = System.getProperty('dunit.single')
-  if (dunitSingle == null || dunitSingle.length() == 0) {
-    dunitSingle = rootProject.hasProperty('dunit.single') ?
-        rootProject.property('dunit.single') : null
-  }
-  String dunitSecSingle = System.getProperty('dunitSecurity.single')
-  if (dunitSecSingle == null || dunitSecSingle.length() == 0) {
-    dunitSecSingle = rootProject.hasProperty('dunitSecurity.single') ?
-        rootProject.property('dunitSecurity.single') : null
-  }
-  String recoverySingle = System.getProperty('recovery.single')
-  if (recoverySingle == null || recoverySingle.length() == 0) {
-    recoverySingle = rootProject.hasProperty('recovery.single') ?
-        rootProject.property('recovery.single') : null
-  }
   def allTasks = subprojects.collect { it.tasks }.flatten()
   allTasks.each { task ->
     if (task instanceof Tar) {
       def tar = (Tar)task
       tar.compression = Compression.GZIP
-      tar.extension = 'tar.gz'
+      tar.archiveExtension.set('tar.gz')
     } else if (task instanceof Jar) {
       def pack = (Jar)task
       if (pack.name == 'packageTests') {
@@ -751,77 +870,6 @@ gradle.taskGraph.whenReady { graph ->
       def test = (Test)task
       test.configure {
 
-        if (test.name == 'dunitTest') {
-          includes.clear()
-          excludes.clear()
-          if (dunitSingle == null || dunitSingle.length() == 0) {
-            def dunitTests = testClassesDirs.asFileTree.matching {
-              includes = [ '**/*DUnitTest.class', '**/*DUnit.class' ]
-              excludes = [ '**/*Suite.class', '**/*DUnitSecurityTest.class', '**/NCJ*DUnit.class', '**/*HDFS*DUnit*.class',
-                  '**/BackwardCompatabilityPart*DUnit.class', '**/*Perf*DUnit.class', '**/ListAggDUnit.class',
-                  '**/SingleHop*TransactionDUnit.class', '**/*Parallel*AsyncEvent*DUnit.class',
-                           '**/pivotal/gemfirexd/wan/**/*DUnit.class', '**/*DUnitRecoveryTest.class' ]
-            }
-            FileTree includeTestFiles = dunitTests
-            int dunitFrom = rootProject.hasProperty('dunit.from') ?
-                getLast(includeTestFiles, rootProject.property('dunit.from')) : 0
-            int dunitTo = rootProject.hasProperty('dunit.to') ?
-                getLast(includeTestFiles, rootProject.property('dunit.to')) : includeTestFiles.size()
-
-            int begin = dunitFrom != -1 ? dunitFrom : 0
-            int end = dunitTo != -1 ? dunitTo : includeTestFiles.size()
-            def filteredSet = includeTestFiles.drop(begin).take(end-begin+1).collect {f -> "**/" + f.name}
-            if (begin != 0 || end != includeTestFiles.size()) {
-              println("Picking tests :")
-              filteredSet.each { a -> println(a) }
-            }
-            include filteredSet
-          } else {
-            include dunitSingle
-          }
-        } else if (test.name == 'dunitSecurityTest') {
-          includes.clear()
-          excludes.clear()
-          if (dunitSecSingle == null || dunitSecSingle.length() == 0) {
-            def dunitSecurityTests = testClassesDirs.asFileTree.matching {
-              includes = [ '**/*DUnitSecurityTest.class' ]
-              excludes = [ '**/*Suite.class', '**/*DUnitTest.class', '**/*DUnit.class', '**/*DUnitRecoveryTest.class' ]
-            }
-            FileTree includeTestFiles = dunitSecurityTests
-            int dunitFrom = rootProject.hasProperty('dunitSecurity.from') ?
-                getLast(includeTestFiles, rootProject.property('dunitSecurity.from')) : 0
-            int dunitTo = rootProject.hasProperty('dunitSecurity.to') ?
-                getLast(includeTestFiles, rootProject.property('dunitSecurity.to')) : includeTestFiles.size()
-
-            int begin = dunitFrom != -1 ? dunitFrom : 0
-            int end = dunitTo != -1 ? dunitTo : includeTestFiles.size()
-            def filteredSet = includeTestFiles.drop(begin).take(end-begin+1).collect {f -> "**/" + f.name}
-            if (begin != 0 || end != includeTestFiles.size()) {
-              println("Picking tests :")
-              filteredSet.each { a -> println(a) }
-            }
-            include filteredSet
-          } else {
-            include dunitSecSingle
-          }
-        } else if (test.name == 'recoveryTest') {
-          includes.clear()
-          excludes.clear()
-          if (recoverySingle == null || recoverySingle.length() == 0) {
-            def recoveryTests = testClassesDirs.asFileTree.matching {
-              includes = [ '**/*DUnitRecoveryTest.class' ]
-              excludes = [ '**/*Suite.class', '**/*DUnitSecurityTest.class', '**/NCJ*DUnit.class', '**/*HDFS*DUnit*.class',
-                           '**/BackwardCompatabilityPart*DUnit.class', '**/*Perf*DUnit.class', '**/ListAggDUnit.class',
-                           '**/SingleHop*TransactionDUnit.class', '**/*Parallel*AsyncEvent*DUnit.class',
-                           '**/pivotal/gemfirexd/wan/**/*DUnit.class', '**/*DUnitTest.class', '**/*DUnit.class' ]
-            }
-            FileTree includeTestFiles = recoveryTests
-            include includeTestFiles.collect {f -> "**/" + f.name}
-          } else {
-            include recoverySingle
-          }
-        }
-
         String logLevel = System.getProperty('logLevel')
         if (logLevel != null && logLevel.length() > 0) {
           systemProperties 'gemfire.log-level'           : logLevel,
@@ -833,11 +881,13 @@ gradle.taskGraph.whenReady { graph ->
                            'securityLogLevel'            : logLevel
         }
 
-        environment 'SNAPPY_HOME': snappyProductDir,
-          'APACHE_SPARK_HOME': sparkProductDir,
-          'APACHE_SPARK_CURRENT_HOME': sparkCurrentProductDir,
-          'SPARK_TESTING': '1',
-          'SNAPPY_DIST_CLASSPATH': test.classpath.asPath
+        systemProperties 'SNAPPY_HOME': snappyProductDir,
+            'APACHE_SPARK_HOME': sparkProductDir,
+            'APACHE_SPARK_CURRENT_HOME': sparkCurrentProductDir
+        environment 'PYSPARK_PYTHON': sparkPython,
+            'PYSPARK_DRIVER_PYTHON': sparkPython,
+            'SPARK_TESTING': '1',
+            'SNAPPY_DIST_CLASSPATH': test.classpath.asPath
 
         def failureCount = new java.util.concurrent.atomic.AtomicInteger(0)
         def progress = new File(workingDir, 'progress.txt')
@@ -931,10 +981,9 @@ task product(type: Zip) {
     dependsOn ":gemfire-connector:product"
   }
 
-
   // create snappydata+spark combined python zip
-  destinationDir = file("${snappyProductDir}/python/lib")
-  archiveName = 'pyspark.zip'
+  destinationDirectory.set(file("${snappyProductDir}/python/lib"))
+  archiveFileName.set('pyspark.zip')
   from("${project(':snappy-spark').projectDir}/python") {
     include 'pyspark/**/*'
   }
@@ -997,10 +1046,10 @@ task product(type: Zip) {
     }
 
     if (rootProject.hasProperty('hadoop-provided')) {
-      releaseFile.append("TIBCO ComputeDB ${version}${gitRevision} " +
+      releaseFile.append("SnappyData ${archiveVersion.get()}${gitRevision} " +
               "built with Hadoop ${hadoopVersion} but hadoop not bundled.\n")
     } else {
-      releaseFile.append("TIBCO ComputeDB ${version}${gitRevision} built for Hadoop ${hadoopVersion}.\n")
+      releaseFile.append("SnappyData ${archiveVersion.get()}${gitRevision} built for Hadoop ${hadoopVersion}.\n")
     }
     releaseFile.append("Build flags:${buildFlags}\n")
 
@@ -1047,48 +1096,42 @@ task product(type: Zip) {
         exclude '.git*'
       }
     }
-      if (hasAqpProject) {
-        // copy enterprise shared libraries for optimized JNI calls
-        copy {
-          from aqpProject.projectDir.path + '/lib'
-          into "${snappyProductDir}/jars"
-        }
-        copy {
-          from aqpProject.projectDir
-          into snappyProductDir
-          include 'NOTICE'
-          include '*EULA*'
-        }
+    if (hasAqpProject) {
+      // copy enterprise shared libraries for optimized JNI calls
+      copy {
+        from aqpProject.projectDir.path + '/lib'
+        into "${snappyProductDir}/jars"
       }
+    }
 
-      def jdbcConnectorProject = project(":snappy-jdbc-connector_${scalaBinaryVersion}")
-      def gemfireConnectorProject = hasGemFireConnectorProject ? project(":gemfire-connector") : null
-      def gfeConnectorProject = hasGemFireConnectorProject ? project(":gemfire-connector:connector_${scalaBinaryVersion}") : null
-      def gfeFunctionProject = hasGemFireConnectorProject ? project(":gemfire-connector:gfeFunctions") : null
+    def jdbcConnectorProject = project(":snappy-jdbc-connector_${scalaBinaryVersion}")
+    def gemfireConnectorProject = hasGemFireConnectorProject ? project(":gemfire-connector") : null
+    def gfeConnectorProject = hasGemFireConnectorProject ? project(":gemfire-connector:connector_${scalaBinaryVersion}") : null
+    def gfeFunctionProject = hasGemFireConnectorProject ? project(":gemfire-connector:gfeFunctions") : null
 
+    copy {
+      from jdbcConnectorProject.jar.destinationDir
+      into "${snappyProductDir}/connectors"
+      include "*.jar"
+    }
+
+    if (hasGemFireConnectorProject) {
       copy {
-        from jdbcConnectorProject.jar.destinationDir
+        from gfeConnectorProject.jar.destinationDir
         into "${snappyProductDir}/connectors"
         include "*.jar"
       }
-
-      if (hasGemFireConnectorProject) {
-        copy {
-          from gfeConnectorProject.jar.destinationDir
-          into "${snappyProductDir}/connectors"
-          include "*.jar"
-        }
-        copy {
-          from gfeFunctionProject.jar.destinationDir
-          into "${snappyProductDir}/connectors"
-          include "*.jar"
-        }
-        copy {
-          from "${gemfireConnectorProject.projectDir}/examples/quickstart/data"
-          into "${snappyProductDir}/connectors"
-          include "persons.jar"
-        }
+      copy {
+        from gfeFunctionProject.jar.destinationDir
+        into "${snappyProductDir}/connectors"
+        include "*.jar"
       }
+      copy {
+        from "${gemfireConnectorProject.projectDir}/examples/quickstart/data"
+        into "${snappyProductDir}/connectors"
+        include "persons.jar"
+      }
+    }
 
     copy {
       from "${examplesProject.buildDir}/libs"
@@ -1129,9 +1172,9 @@ task product(type: Zip) {
       }
 
       exec {
-        environment "SPARK_HOME", snappyProductDir
-        environment "NO_TESTS", "1"
-        environment "CLEAN_INSTALL", "1"
+        environment 'SPARK_HOME', snappyProductDir,
+            'NO_TESTS', '1',
+            'CLEAN_INSTALL', '1'
         workingDir targetRDir
         commandLine "${targetRDir}/check-cran.sh"
       }
@@ -1148,9 +1191,6 @@ if (rootProject.hasProperty('copyToDir')) {
   }
 }
 
-// TODO: right now just copying over the product contents.
-// Can flip it around and let distribution do all the work.
-
 distributions {
   main {
     baseName = 'snappydata'
@@ -1227,14 +1267,14 @@ distTar {
   // if (isEnterpriseProduct) {
   //   archiveName = 'TIB_compute' + devEdition + '_' + version + '_' + buildDateShort + osFamilyName + '.tar.gz'
   // } else {
-    classifier 'bin'
+  classifier 'bin'
   // }
   dependsOn product
   if (rootProject.hasProperty('enablePublish')) {
     dependsOn ':packageZeppelinInterpreter'
   }
   compression = Compression.GZIP
-  extension = 'tar.gz'
+  archiveExtension.set('tar.gz')
   if (rootProject.hasProperty('hadoop-provided')) {
     classifier 'without-hadoop-bin'
   }
@@ -1251,9 +1291,8 @@ distZip {
   }
 }
 
-// disable distZip by default
 assemble.dependsOn.clear()
-assemble.dependsOn product, distTar
+assemble.dependsOn product
 
 task distRpm {
   dependsOn product
@@ -1314,7 +1353,7 @@ task generateSources {
   // copy all resource files into build classes path because new versions of IDEA
   // do not include separate resources path in CLASSPATH if output path has been customized
   doLast {
-    subprojects.collect { proj ->
+    subprojects.forEach { proj ->
       String resourcesDir = proj.sourceSets.main.output.resourcesDir
       if (file(resourcesDir).exists()) {
         def projOutDir = file("${proj.projectDir}/src/main/scala").exists()
@@ -1353,6 +1392,8 @@ task buildDtests {
   dependsOn "snappy-dtests_${scalaBinaryVersion}:buildDtests"
 }
 task checkAll {
+  dependsOn ":snappy-aqp_${scalaBinaryVersion}:scalaStyle"
+  dependsOn ":snappy-jdbc-connector_${scalaBinaryVersion}:scalaStyle"
   dependsOn ':snappy-spark:scalaStyle'
   if (rootProject.hasProperty('store')) {
     dependsOn ':snappy-store:check'
@@ -1368,7 +1409,7 @@ task checkAll {
   if (!rootProject.hasProperty('aqp.skip')) {
     dependsOn ":snappy-aqp_${scalaBinaryVersion}:check"
   }
-  if (!rootProject.hasProperty('connectors.skip') && hasGemFireConnectorProject) {
+  if (hasGemFireConnectorProject && !rootProject.hasProperty('connectors.skip')) {
     dependsOn ":gemfire-connector:check"
   }
   if (!rootProject.hasProperty('smoke.skip')) {
@@ -1389,7 +1430,7 @@ gradle.taskGraph.whenReady { graph ->
   tasks.getByName('allReports').reportOn rootProject.subprojects.collect{ it.tasks.withType(Test) }.flatten()
 }
 
-def writeProperties(def parent, def name, def comment, def propsMap) {
+static void writeProperties(File parent, String name, def comment, def propsMap) {
   parent.exists() || parent.mkdirs()
   def writer = new File(parent, name).newWriter()
   def props = new Properties()
@@ -1402,7 +1443,7 @@ def writeProperties(def parent, def name, def comment, def propsMap) {
   }
 }
 
-int getLast(includeTestFiles, pattern) {
+static int getLast(includeTestFiles, pattern) {
   includeTestFiles.findLastIndexOf {
     File f -> f.name.indexOf(pattern) >= 0
   }
@@ -1490,6 +1531,8 @@ task docs(type: ScalaDoc) {
   scalaDocOptions.additionalParameters = [ '-J-Xmx7g', '-J-XX:ReservedCodeCacheSize=512m', '-J-Djava.net.preferIPv4Stack=true' ]
 
   dependsOn deleteDocsDir
+  mustRunAfter buildAll
+
   Set<String> allSource = []
   def docProjects = rootProject.subprojects.collectMany { project ->
     if ((project.plugins.hasPlugin('scala') || project.plugins.hasPlugin('java')) &&
@@ -1535,7 +1578,7 @@ task buildSqlFuncDocs(type: Exec) {
   commandLine "${rootProject.projectDir}/spark/sql/create-docs.sh"
 }
 
-task publishDocs(type:Exec) {
+task publishDocs(type: Exec) {
   dependsOn docs, buildSqlFuncDocs
   //on linux
   commandLine './publish-site.sh'
@@ -1544,7 +1587,7 @@ task publishDocs(type:Exec) {
 
 // It runs test script from product dir. Hence if running the target individually make sure
 // to run product target first
-task checkPython(type:Exec) {
+task checkPython(type: Exec) {
   String wdir = "${testResultsBase}/python"
   delete wdir
   file(wdir).mkdirs()
diff --git a/cluster/bin/snappy b/cluster/bin/snappy
index cc0d815d72..3651cd9e30 100755
--- a/cluster/bin/snappy
+++ b/cluster/bin/snappy
@@ -112,7 +112,9 @@ elif [ -z "$SNAPPY_NO_QUICK_LAUNCH" -a $# -ge 2 \
           HOSTNAME_FOR_CLIENTS="-hostname-for-clients=${IMPLICIT_CLIENT_BIND_ADDRESS}"
           export SPARK_PUBLIC_DNS="${IMPLICIT_CLIENT_BIND_ADDRESS}"
         fi
-      elif [ -n "$EXPLICIT_CLIENT_BIND_ADDRESS" -a -z "$SPARK_PUBLIC_DNS" ]; then
+      elif [ -n "$EXPLICIT_CLIENT_BIND_ADDRESS" -a -z "$SPARK_PUBLIC_DNS" \
+             -a "$EXPLICIT_CLIENT_BIND_ADDRESS" != "0.0.0.0" \
+             -a "$EXPLICIT_CLIENT_BIND_ADDRESS" != "::0" ]; then
         HOSTNAME_FOR_CLIENTS="-hostname-for-clients=${EXPLICIT_CLIENT_BIND_ADDRESS}"
         export SPARK_PUBLIC_DNS="${EXPLICIT_CLIENT_BIND_ADDRESS}"
       fi
diff --git a/cluster/build.gradle b/cluster/build.gradle
index 95d56fa38d..72de2630e2 100644
--- a/cluster/build.gradle
+++ b/cluster/build.gradle
@@ -112,7 +112,26 @@ dependencies {
     compile group: 'io.snappydata', name: 'spark-jobserver_' + scalaBinaryVersion, version: sparkJobServerVersion
   }
   // support AWS URLs
-  compile "org.apache.hadoop:hadoop-aws:${hadoopVersion}" 
+  compile(group: 'org.apache.hadoop', name: 'hadoop-aws', version: hadoopVersion) {
+    exclude(group: 'asm', module: 'asm')
+    exclude(group: 'org.codehaus.jackson', module: 'jackson-mapper-asl')
+    exclude(group: 'org.ow2.asm', module: 'asm')
+    exclude(group: 'org.apache.zookeeper', module: 'zookeeper')
+    exclude(group: 'org.jboss.netty', module: 'netty')
+    exclude(group: 'jline', module: 'jline')
+    exclude(group: 'commons-logging', module: 'commons-logging')
+    exclude(group: 'org.mockito', module: 'mockito-all')
+    exclude(group: 'org.mortbay.jetty', module: 'servlet-api-2.5')
+    exclude(group: 'javax.servlet', module: 'servlet-api')
+    exclude(group: 'junit', module: 'junit')
+    exclude(group: 'com.google.guava', module: 'guava')
+    exclude(group: 'com.sun.jersey')
+    exclude(group: 'com.sun.jersey.jersey-test-framework')
+    exclude(group: 'com.sun.jersey.contribs')
+    exclude(group: 'com.google.protobuf', module: 'protobuf-java')
+    exclude(group: 'com.jcraft', module: 'jsch')
+    exclude(group: 'org.apache.directory.server', module: 'apacheds-kerberos-codec')
+  }
 
   compile "io.snappydata:spark-metrics:${snappySparkMetricsLibVersion}"
 
@@ -188,7 +207,7 @@ task createVersionPropertiesFile(dependsOn: 'processResources') {
 compileJava.dependsOn createVersionPropertiesFile
 
 task packageScalaDocs(type: Jar, dependsOn: scaladoc) {
-  classifier = 'javadoc'
+  archiveClassifier.set('javadoc')
   from scaladoc
 }
 if (rootProject.hasProperty('enablePublish')) {
@@ -197,14 +216,6 @@ if (rootProject.hasProperty('enablePublish')) {
   }
 }
 
-def copyDirs(def srcDir, def destDir) {
-  mkdir(destDir)
-  copy {
-    from srcDir
-    into destDir
-  }
-}
-
 test.dependsOn ':cleanJUnit'
 scalaTest {
   dependsOn ':cleanScalaTest'
diff --git a/cluster/sbin/snappy-nodes.sh b/cluster/sbin/snappy-nodes.sh
index 3c0ee923c5..81e4ab89f5 100755
--- a/cluster/sbin/snappy-nodes.sh
+++ b/cluster/sbin/snappy-nodes.sh
@@ -276,7 +276,7 @@ function execute() {
          mkdir -p "$dirfolder"
       fi
     fi
-    launchcommand="${@// /\\ } ${args} ${postArgs} < /dev/null 2>&1"
+    launchcommand="${preCommand}${@// /\\ } ${args} ${postArgs} < /dev/null 2>&1"
     eval $launchcommand &
     LAST_PID="$!"
   fi
diff --git a/cluster/src/dunit/scala/io/snappydata/cluster/ClusterManagerTestBase.scala b/cluster/src/dunit/scala/io/snappydata/cluster/ClusterManagerTestBase.scala
index ce51bcde94..bc802dd397 100644
--- a/cluster/src/dunit/scala/io/snappydata/cluster/ClusterManagerTestBase.scala
+++ b/cluster/src/dunit/scala/io/snappydata/cluster/ClusterManagerTestBase.scala
@@ -20,7 +20,6 @@ import java.sql.{Connection, DriverManager}
 import java.util.Properties
 
 import scala.language.postfixOps
-import scala.sys.process._
 import scala.util.Random
 
 import com.gemstone.gemfire.internal.shared.NativeCalls
@@ -33,9 +32,9 @@ import io.snappydata.test.dunit._
 import io.snappydata.util.TestUtils
 import org.slf4j.LoggerFactory
 
-import org.apache.spark.sql.{SnappyContext, SnappySession}
 import org.apache.spark.sql.collection.Utils
 import org.apache.spark.sql.execution.ConnectionPool
+import org.apache.spark.sql.{SnappyContext, SnappySession}
 import org.apache.spark.{Logging, SparkContext}
 /**
  * Base class for tests using Snappy ClusterManager. New utility methods
@@ -370,18 +369,6 @@ object ClusterManagerTestBase extends Logging {
       throwOnTimeout)
   }
 
-  def startSparkCluster(productDir: String): Unit = {
-    logInfo(s"Starting spark cluster in $productDir/work")
-    (productDir + "/sbin/start-all.sh") !!
-  }
-
-  def stopSparkCluster(productDir: String): Unit = {
-    val sparkContext = SnappyContext.globalSparkContext
-    logInfo(s"Stopping spark cluster in $productDir/work")
-    if (sparkContext != null) sparkContext.stop()
-    (productDir + "/sbin/stop-all.sh") !!
-  }
-
   def validateNoActiveSnapshotTX(): Unit = {
     val cache = Misc.getGemFireCache
     val txMgr = cache.getCacheTransactionManager
diff --git a/cluster/src/dunit/scala/io/snappydata/cluster/PrimaryDUnitRecoveryTest.scala b/cluster/src/dunit/scala/io/snappydata/cluster/PrimaryDUnitRecoveryTest.scala
index d0d0e7e8eb..697dfd7ffb 100644
--- a/cluster/src/dunit/scala/io/snappydata/cluster/PrimaryDUnitRecoveryTest.scala
+++ b/cluster/src/dunit/scala/io/snappydata/cluster/PrimaryDUnitRecoveryTest.scala
@@ -16,16 +16,14 @@
  */
 package io.snappydata.cluster
 
-import java.io.{BufferedOutputStream, BufferedWriter, ByteArrayOutputStream, File, FileWriter,
-  PrintStream, PrintWriter}
-import java.sql.{Connection, DriverManager, ResultSet, Statement, Timestamp}
+import java.io.{BufferedOutputStream, ByteArrayOutputStream, File, PrintStream}
+import java.sql.{Connection, DriverManager, ResultSet, Statement}
 import java.util.Properties
 
 import scala.collection.mutable
 import scala.collection.mutable.{ArrayBuffer, ListBuffer}
-import scala.sys.process.{Process, ProcessLogger, stderr, stdout, _}
+import scala.sys.process._
 import scala.util.Try
-import scala.util.control.NonFatal
 
 import com.pivotal.gemfirexd.Attribute
 import com.pivotal.gemfirexd.Property.{AUTH_LDAP_SEARCH_BASE, AUTH_LDAP_SERVER}
@@ -40,7 +38,7 @@ import org.apache.spark.sql.collection.Utils
 import org.apache.spark.sql.udf.UserDefinedFunctionsDUnitTest
 
 class PrimaryDUnitRecoveryTest(s: String) extends DistributedTestBase(s)
-    with Logging {
+    with ClusterUtils with Logging {
 
   val adminUser1 = "gemfire10"
   private val locatorNetPort = AvailablePortHelper.getRandomAvailableTCPPort
@@ -63,8 +61,6 @@ class PrimaryDUnitRecoveryTest(s: String) extends DistributedTestBase(s)
    * start LDAP server in beforeAll
    */
   override def beforeClass(): Unit = {
-
-    PrimaryDUnitRecoveryTest.snappyHome = System.getenv("SNAPPY_HOME")
     // start LDAP server
     logInfo("Starting LDAP server")
     // starts LDAP server and sets LDAP properties to be passed to conf files
@@ -86,6 +82,7 @@ class PrimaryDUnitRecoveryTest(s: String) extends DistributedTestBase(s)
     // 1. stop  ldap cluster.
     stopLdapTestServer()
     // 2. delete all
+    stopCluster(deleteData = true)
   }
 
   def stopLdapTestServer(): Unit = {
@@ -111,17 +108,13 @@ class PrimaryDUnitRecoveryTest(s: String) extends DistributedTestBase(s)
   }
 
   def startSnappyCluster(): Unit = {
-    val (out, _) =
-      PrimaryDUnitRecoveryTest.executeCommand(s"${PrimaryDUnitRecoveryTest.snappyHome}" +
-        s"/sbin/snappy-start-all.sh --config $confDirPath")
-
+    val out = startSnappyCluster(startArgs = s"--config $confDirPath")
     // TODO need a better way to ensure the cluster has started
     if (!out.contains("Distributed system now")) {
-      throw new Exception(s"Failed to start Snappy cluster.")
+      throw new RuntimeException("Failed to start Snappy cluster.")
     }
   }
 
-
   def basicOperationSetSnappyCluster(stmt: Statement, defaultSchema: String = "APP"): Unit = {
     // covers case: data only in row buffers
     stmt.execute(
@@ -220,16 +213,12 @@ class PrimaryDUnitRecoveryTest(s: String) extends DistributedTestBase(s)
         " options(path '/tmp/test1_exttab1.csv')")
   }
 
-  def stopCluster(): Unit = {
-    // TODO need a way to ensure the cluster has stopped
-    PrimaryDUnitRecoveryTest.executeCommand(s"${PrimaryDUnitRecoveryTest.snappyHome}" +
-        s"/sbin/snappy-stop-all.sh --config $confDirPath")
+  def stopCluster(deleteData: Boolean = false): Unit = {
+    stopSnappyCluster(stopArgs = s"--config $confDirPath", deleteData = deleteData)
   }
 
   def startSnappyRecoveryCluster(): Unit = {
-    val (out, _) =
-      PrimaryDUnitRecoveryTest.executeCommand(s"${PrimaryDUnitRecoveryTest.snappyHome}" +
-        s"/sbin/snappy-start-all.sh --recover --config $confDirPath")
+    val out = startSnappyCluster(startArgs = s"--recover --config $confDirPath")
     // TODO need a better way to ensure the cluster has started
     if (!out.contains("Distributed system now")) {
       throw new Exception(s"Failed to start Snappy cluster in recovery mode.")
@@ -299,7 +288,7 @@ class PrimaryDUnitRecoveryTest(s: String) extends DistributedTestBase(s)
         case _ => stringBuilder ++= s"${resultSet.getObject(colCount)}"
       }
       // todo: can be improved using batching 100 rows
-      writeToFile(stringBuilder.toString(), filePathOrg, true)
+      writeToFile(stringBuilder.append('\n').toString(), filePathOrg, append = true)
     }
     null
   }
@@ -333,7 +322,7 @@ class PrimaryDUnitRecoveryTest(s: String) extends DistributedTestBase(s)
             }
             case blob: ClientBlob => {
               stringBuilder ++= s"${
-                scala.io.Source.fromInputStream(resultSet.getBlob(i).getBinaryStream).mkString
+                scala.io.Source.fromInputStream(blob.getBinaryStream).mkString
               },"
             }
             case _ =>
@@ -348,14 +337,14 @@ class PrimaryDUnitRecoveryTest(s: String) extends DistributedTestBase(s)
           }
           case blob: ClientBlob => {
             stringBuilder ++= s"${
-              scala.io.Source.fromInputStream(resultSet.getBlob(colCount).getBinaryStream).mkString
+              scala.io.Source.fromInputStream(blob.getBinaryStream).mkString
             }"
           }
           case _ =>
             stringBuilder ++= s"${resultSet.getObject(colCount)}"
         }
         // todo: can be improved using batching 100 rows
-        writeToFile(stringBuilder.toString(), filePathOrg, true)
+        writeToFile(stringBuilder.append('\n').toString(), filePathOrg, append = true)
       }
     } else {
       val colCount: Int = resultSet.getMetaData.getColumnCount
@@ -370,7 +359,7 @@ class PrimaryDUnitRecoveryTest(s: String) extends DistributedTestBase(s)
             }
             case blob: ClientBlob => {
               stringBuilder ++= s"${
-                scala.io.Source.fromInputStream(resultSet.getBlob(i).getBinaryStream).mkString
+                scala.io.Source.fromInputStream(blob.getBinaryStream).mkString
               },"
             }
             case _ =>
@@ -385,7 +374,7 @@ class PrimaryDUnitRecoveryTest(s: String) extends DistributedTestBase(s)
           }
           case blob: ClientBlob => {
             stringBuilder ++= s"${
-              scala.io.Source.fromInputStream(resultSet.getBlob(colCount).getBinaryStream).mkString
+              scala.io.Source.fromInputStream(blob.getBinaryStream).mkString
             }"
           }
           case _ =>
@@ -393,7 +382,7 @@ class PrimaryDUnitRecoveryTest(s: String) extends DistributedTestBase(s)
         }
 
         // todo: can be improved using batching 100 rows
-        writeToFile(stringBuilder.toString(), filePathRec, true)
+        writeToFile(stringBuilder.append('\n').toString(), filePathRec, append = true)
       }
       val cmd = s"comm --nocheck-order -3 $filePathOrg $filePathRec"
       var diffRes: String = ""
@@ -413,41 +402,6 @@ class PrimaryDUnitRecoveryTest(s: String) extends DistributedTestBase(s)
     }
   }
 
-
-  def writeToFile(str: String, filePath: String, append: Boolean = false): Unit = {
-    var pw: PrintWriter = null
-    if (append) {
-      val fileWriter = new FileWriter(filePath, append)
-      val bufferedWriter = new BufferedWriter(fileWriter)
-      pw = new PrintWriter(bufferedWriter)
-      pw.println(str)
-      pw.close()
-      bufferedWriter.close()
-      fileWriter.close()
-    } else {
-      pw = new PrintWriter(filePath)
-      pw.write(str)
-      pw.flush()
-      pw.close()
-      // wait until file becomes available (e.g. running on NFS)
-      var matched = false
-      while (!matched) {
-        Thread.sleep(100)
-        try {
-          val source = scala.io.Source.fromFile(filePath)
-          val lines = try {
-            source.mkString
-          } finally {
-            source.close()
-          }
-          matched = lines == str
-        } catch {
-          case NonFatal(_) =>
-        }
-      }
-    }
-  }
-
   def getConn(port: Int, user: String = "", password: String = ""): Connection = {
     val driver = "io.snappydata.jdbc.ClientDriver"
     val url: String = "jdbc:snappydata://localhost:" + port + "/"
@@ -468,7 +422,7 @@ class PrimaryDUnitRecoveryTest(s: String) extends DistributedTestBase(s)
   def test1(): Unit = {
     try {
       // set separate work directory and conf directory
-      confDirPath = createConfDir("test1");
+      confDirPath = createConfDir("test1")
       val leadsNum = 1
       val locatorsNum = 1
       val serversNum = 1
@@ -482,15 +436,13 @@ class PrimaryDUnitRecoveryTest(s: String) extends DistributedTestBase(s)
 
       val locNetPort = locatorNetPort
       val netPort2 = AvailablePortHelper.getRandomAvailableTCPPort
-      val netPort3 = AvailablePortHelper.getRandomAvailableTCPPort
       val ldapConf = PrimaryDUnitRecoveryTest.getLdapConf
       writeToFile(s"localhost  -peer-discovery-port=$locatorPort -dir=$workDirPath/locator-1" +
           s" -client-port=$locNetPort $ldapConf", s"$confDirPath/locators")
       writeToFile(s"localhost  -locators=localhost[$locatorPort]  -dir=$workDirPath/lead-1" +
           s" $waitForInit $ldapConf", s"$confDirPath/leads")
-      writeToFile(
-        s"""localhost  -locators=localhost[$locatorPort] -dir=$workDirPath/server-1 -client-port=$netPort2 $ldapConf
-           |""".stripMargin, s"$confDirPath/servers")
+      writeToFile(s"localhost  -locators=localhost[$locatorPort] -dir=$workDirPath/server-1" +
+          s" -client-port=$netPort2 $ldapConf", s"$confDirPath/servers")
 
       startSnappyCluster()
 
@@ -512,7 +464,7 @@ class PrimaryDUnitRecoveryTest(s: String) extends DistributedTestBase(s)
       val connRec = getConn(locNetPort, "gemfire10", "gemfire10")
       val stmtRec = connRec.createStatement()
       // reused below multiple times; clear before using str
-      var str: StringBuilder = new StringBuilder
+      val str = new StringBuilder
       var tempTab = ""
       val arrBuf: ArrayBuffer[String] = ArrayBuffer.empty
       var i = 0
@@ -579,7 +531,7 @@ class PrimaryDUnitRecoveryTest(s: String) extends DistributedTestBase(s)
       while (rs.next()) {
         str ++= s"${rs.getString(1)}\t"
       }
-      //todo need to find a better way to assert the result
+      // TODO need to find a better way to assert the result
       assert(str.toString().toUpperCase().contains("CREATE "))
       rs.close()
 
@@ -755,13 +707,16 @@ class PrimaryDUnitRecoveryTest(s: String) extends DistributedTestBase(s)
 
       // todo: test with 2 locators
 
-      writeToFile(s"localhost  -peer-discovery-port=$locatorPort -recovery-state-chunk-size=20 -dir=$workDirPath/locator-1" +
-          s" -client-port=$locNetPort $ldapConf", s"$confDirPath/locators")
+      writeToFile(s"localhost  -peer-discovery-port=$locatorPort -recovery-state-chunk-size=20" +
+          s" -dir=$workDirPath/locator-1 -client-port=$locNetPort $ldapConf",
+        s"$confDirPath/locators")
       writeToFile(s"localhost  -locators=localhost[$locatorPort]  -dir=$workDirPath/lead-1" +
           s" $waitForInit $ldapConf", s"$confDirPath/leads")
       writeToFile(
-        s"""localhost  -locators=localhost[$locatorPort] -recovery-state-chunk-size=50 -dir=$workDirPath/server-1 -client-port=$netPort2 $ldapConf
-           |localhost  -locators=localhost[$locatorPort] -dir=$workDirPath/server-2 -client-port=$netPort3 $ldapConf
+        s"""localhost  -locators=localhost[$locatorPort] -recovery-state-chunk-size=50 \\
+           |           -dir=$workDirPath/server-1 -client-port=$netPort2 $ldapConf
+           |localhost  -locators=localhost[$locatorPort] -dir=$workDirPath/server-2 \\
+           |           -client-port=$netPort3 $ldapConf
            |""".stripMargin, s"$confDirPath/servers")
 
       startSnappyCluster()
@@ -1113,7 +1068,7 @@ class PrimaryDUnitRecoveryTest(s: String) extends DistributedTestBase(s)
 
       var connRec: Connection = null: Connection
       var stmtRec: Statement = null: Statement
-      var str = new mutable.StringBuilder()
+      val str = new StringBuilder()
       val arrBuf: ArrayBuffer[String] = ArrayBuffer.empty
       var i = 0
 
@@ -1135,13 +1090,13 @@ class PrimaryDUnitRecoveryTest(s: String) extends DistributedTestBase(s)
 
       rs = stmtRec.executeQuery("select col1, col2, col3, col4," +
           " col5 from gemfire10.test3tab3 ORDER BY col5")
+      // scalastyle:off println
       println("select * from test3tab3 =======================")
       resetBuffer
 
       arrBuf ++= ArrayBuffer("a,b,1,adsf,123", "aa,bb,11,adsfg,1234", "aaa,bbb,1111,adsfgh," +
           "12345", "asdf,bnm,1111111,adsfghi,123456")
       while (rs.next()) {
-        // scalastyle:off println
         println(s"${rs.getBlob(1)},${rs.getClob(2)},${rs.getBlob(3)}," +
             s"${rs.getString(4)},${rs.getInt(5)}")
         assert(s"${scala.io.Source.fromInputStream(rs.getBlob(1).getBinaryStream).mkString}," +
@@ -1150,6 +1105,7 @@ class PrimaryDUnitRecoveryTest(s: String) extends DistributedTestBase(s)
             s"${rs.getString(4)},${rs.getInt(5)}" == arrBuf(i))
         i += 1
       }
+      // scalastyle:on println
 
       rs = stmtRec.executeQuery("select col1, col2, col3 from" +
           " gemfire10.test3_coltab4 ORDER BY col1")
@@ -1328,16 +1284,14 @@ class PrimaryDUnitRecoveryTest(s: String) extends DistributedTestBase(s)
       val locatorPort = AvailablePortHelper.getRandomAvailableUDPPort
       val locNetPort = locatorNetPort
       val netPort2 = AvailablePortHelper.getRandomAvailableTCPPort
-      val netPort3 = AvailablePortHelper.getRandomAvailableTCPPort
       val ldapConf = PrimaryDUnitRecoveryTest.getLdapConf
 
       writeToFile(s"localhost  -peer-discovery-port=$locatorPort -dir=$workDirPath/locator-1" +
           s" -client-port=$locNetPort $ldapConf", s"$confDirPath/locators")
       writeToFile(s"localhost  -locators=localhost[$locatorPort]  -dir=$workDirPath/lead-1" +
           s" $waitForInit $ldapConf", s"$confDirPath/leads")
-      writeToFile(
-        s"""localhost  -locators=localhost[$locatorPort] -recovery-state-chunk-size=20 -dir=$workDirPath/server-1 -client-port=$netPort2 $ldapConf
-           |""".stripMargin, s"$confDirPath/servers")
+      writeToFile(s"localhost  -locators=localhost[$locatorPort] -recovery-state-chunk-size=20" +
+          s" -dir=$workDirPath/server-1 -client-port=$netPort2 $ldapConf", s"$confDirPath/servers")
 
       startSnappyCluster()
       var conn: Connection = null: Connection
@@ -1407,11 +1361,11 @@ class PrimaryDUnitRecoveryTest(s: String) extends DistributedTestBase(s)
       stmt.execute("deploy package SPARKREDSHIFT" +
           " 'com.databricks:spark-redshift_2.10:3.0.0-preview1' path '/tmp/deploy_pkg_cache'")
       stmt.execute("deploy package Sparkcassandra 'com.datastax" +
-          ".spark:spark-cassandra-connector_2.11:2.0.7';")
+          ".spark:spark-cassandra-connector_2.11:2.0.13';")
       stmt.execute("deploy package MSSQL 'com.microsoft.sqlserver:sqljdbc4:4.0'" +
-          " repos 'http://clojars.org/repo/'")
+          " repos 'https://clojars.org/repo/'")
       stmt.execute("deploy package mysql 'clj-mysql:clj-mysql:0.1.0'" +
-          " repos 'http://clojars.org/repo/' path '/tmp/deploy_pkg_cache'")
+          " repos 'https://clojars.org/repo/' path '/tmp/deploy_pkg_cache'")
       stmt.execute(s"deploy jar snappyjar" +
           s" '${PrimaryDUnitRecoveryTest.snappyHome}/jars/zkclient-0.8.jar'")
       stmt.execute(s"deploy jar snappyjar2" +
@@ -1516,21 +1470,19 @@ class PrimaryDUnitRecoveryTest(s: String) extends DistributedTestBase(s)
       val locatorPort = AvailablePortHelper.getRandomAvailableUDPPort
       val locNetPort = locatorNetPort
       val netPort2 = AvailablePortHelper.getRandomAvailableTCPPort
-      val netPort3 = AvailablePortHelper.getRandomAvailableTCPPort
       val ldapConf = PrimaryDUnitRecoveryTest.getLdapConf
       writeToFile(s"localhost  -peer-discovery-port=$locatorPort -dir=$workDirPath/locator-1" +
           s" -client-port=$locNetPort $ldapConf", s"$confDirPath/locators")
       writeToFile(s"localhost  -locators=localhost[$locatorPort]  -dir=$workDirPath/lead-1" +
           s" $waitForInit $ldapConf", s"$confDirPath/leads")
-      writeToFile(
-        s"localhost  -locators=localhost[$locatorPort] -recovery-state-chunk-size=40 -dir=$workDirPath/server-1 " +
-            s"-client-port=$netPort2 $ldapConf".stripMargin, s"$confDirPath/servers")
+      writeToFile(s"localhost  -locators=localhost[$locatorPort] -recovery-state-chunk-size=40" +
+          s" -dir=$workDirPath/server-1 -client-port=$netPort2 $ldapConf".stripMargin,
+        s"$confDirPath/servers")
 
       startSnappyCluster()
 
       val conn = getConn(locNetPort, "gemfire10", "gemfire10")
       val stmt = conn.createStatement()
-      val defaultSchema = "gemfire10"
       var fqtn: String = null
 
       // todo: Add nested complex data types tests
@@ -1754,8 +1706,6 @@ class PrimaryDUnitRecoveryTest(s: String) extends DistributedTestBase(s)
 
       var connRec: Connection = null
       var stmtRec: Statement = null
-      var str = new mutable.StringBuilder()
-      val arrBuf: ArrayBuffer[String] = ArrayBuffer.empty
 
       logInfo("============ Recovery mode ============")
       connRec = getConn(locNetPort, "gemfire10", "gemfire10")
@@ -1763,7 +1713,7 @@ class PrimaryDUnitRecoveryTest(s: String) extends DistributedTestBase(s)
       Thread.sleep(3000)
 
       def getRecFromResultSet(rs: ResultSet, schemaStr: String): ListBuffer[Array[Any]] = {
-        var result = new ListBuffer[Array[Any]]()
+        val result = new ListBuffer[Array[Any]]()
         while (rs.next()) {
           var i = 1
           val recArr = schemaStr.split(",").map(_.toLowerCase).map(f => {
@@ -2000,7 +1950,7 @@ object PrimaryDUnitRecoveryTest extends Logging {
   def getJdbcConnection(netPort: Int): Connection = {
     val driver = "io.snappydata.jdbc.ClientDriver"
     Utils.classForName(driver).newInstance
-    var url: String = "jdbc:snappydata://localhost:" + netPort + "/"
+    val url: String = "jdbc:snappydata://localhost:" + netPort + "/"
     DriverManager.getConnection(url)
   }
 
diff --git a/cluster/src/dunit/scala/io/snappydata/cluster/SnappyMetricsSystemDUnitTest.scala b/cluster/src/dunit/scala/io/snappydata/cluster/SnappyMetricsSystemDUnitTest.scala
index 6a86b4fee7..d4ab908b21 100644
--- a/cluster/src/dunit/scala/io/snappydata/cluster/SnappyMetricsSystemDUnitTest.scala
+++ b/cluster/src/dunit/scala/io/snappydata/cluster/SnappyMetricsSystemDUnitTest.scala
@@ -16,35 +16,35 @@
  */
 package io.snappydata.cluster
 
-import java.io.{File, PrintWriter}
-import java.nio.file.{Files, Paths}
 import java.sql.{Connection, DriverManager, Statement}
 
+import scala.collection.mutable
+import scala.sys.process._
+
 import io.snappydata.Constant
 import io.snappydata.test.dunit.{AvailablePortHelper, DistributedTestBase}
-import org.apache.spark.Logging
+import org.json4s.DefaultFormats
 import org.json4s.jackson.JsonMethods._
 import org.junit.Assert.assertEquals
-import org.json4s.DefaultFormats
 
-import scala.collection.mutable
-import scala.sys.process._
+import org.apache.spark.Logging
 
 class SnappyMetricsSystemDUnitTest(s: String)
-    extends DistributedTestBase(s) with Logging {
-
+    extends DistributedTestBase(s) with ClusterUtils with Logging {
 
   val port = AvailablePortHelper.getRandomAvailableTCPPort
   val netPort = AvailablePortHelper.getRandomAvailableTCPPort
   val netPort2 = AvailablePortHelper.getRandomAvailableTCPPort
   val netPort3 = AvailablePortHelper.getRandomAvailableTCPPort
   val netPort4 = AvailablePortHelper.getRandomAvailableTCPPort
-  val snappyProductDir = System.getenv("SNAPPY_HOME")
-  private var conn: Connection = null
-  private var stmt: Statement = null
+
+  private var conn: Connection = _
+  private var stmt: Statement = _
 
   override def beforeClass(): Unit = {
     super.beforeClass()
+    // stop any previous cluster and cleanup data
+    stopSnappyCluster()
     logInfo(s"Starting snappy cluster in $snappyProductDir/work with locator client port $netPort")
     (s"mkdir -p $snappyProductDir/work/locator" +
         s" $snappyProductDir/work/lead1" +
@@ -53,53 +53,45 @@ class SnappyMetricsSystemDUnitTest(s: String)
         s" $snappyProductDir/work/server2" +
         s" $snappyProductDir/work/server3").!!
     val confDir = s"$snappyProductDir/conf"
-    val sobj = new SplitClusterDUnitTest(s)
-    val pw = new PrintWriter(new File(s"$confDir/locators"))
-    pw.write(s"localhost -dir=$snappyProductDir/work/locator" +
-        s" -peer-discovery-port=$port -client-port=$netPort")
-    pw.close()
-    val pw1 = new PrintWriter(new File(s"$confDir/leads"))
-    pw1.write(s"localhost -locators=localhost[$port] " +
-        s"-dir=$snappyProductDir/work/lead1 -spark.ui.port=9090\n")
-    pw1.write(s"localhost -locators=localhost[$port] " +
-        s"-dir=$snappyProductDir/work/lead2 -spark.ui.port=8090")
-    pw1.close()
-    val pw2 = new PrintWriter(new File(s"$confDir/servers"))
-    pw2.write(s"localhost -locators=localhost[$port] -dir=$snappyProductDir/work/server1 -client-port=$netPort2\n")
-    pw2.write(s"localhost -locators=localhost[$port] -dir=$snappyProductDir/work/server2 -client-port=$netPort3\n")
-    pw2.write(s"localhost -locators=localhost[$port] -dir=$snappyProductDir/work/server3 -client-port=$netPort4")
-    pw2.close()
-    logInfo(s"Starting snappy cluster in $snappyProductDir/work")
-    logInfo((snappyProductDir + "/sbin/snappy-start-all.sh").!!)
-    Thread.sleep(10000)
+    writeToFile(s"localhost -dir=$snappyProductDir/work/locator" +
+        s" -peer-discovery-port=$port -client-port=$netPort", s"$confDir/locators")
+    writeToFile(
+      s"""localhost -locators=localhost[$port] -dir=$snappyProductDir/work/lead1 -spark.ui.port=9090
+         |localhost -locators=localhost[$port] -dir=$snappyProductDir/work/lead2 -spark.ui.port=8090
+         |""".stripMargin, s"$confDir/leads")
+    writeToFile(
+      s"""localhost -locators=localhost[$port] -dir=$snappyProductDir/work/server1 \\
+         |          -client-port=$netPort2
+         |localhost -locators=localhost[$port] -dir=$snappyProductDir/work/server2 \\
+         |          -client-port=$netPort3
+         |localhost -locators=localhost[$port] -dir=$snappyProductDir/work/server3 \\
+         |          -client-port=$netPort4
+         |""".stripMargin, s"$confDir/servers")
+    startSnappyCluster()
   }
 
   override def afterClass(): Unit = {
     super.afterClass()
-    logInfo((snappyProductDir + "/sbin/snappy-stop-all.sh").!!)
-    s"rm -rf $snappyProductDir/work".!!
-    Files.deleteIfExists(Paths.get(snappyProductDir, "conf", "locators"))
-    Files.deleteIfExists(Paths.get(snappyProductDir, "conf", "leads"))
-    Files.deleteIfExists(Paths.get(snappyProductDir, "conf", "servers"))
+    stopSnappyCluster()
   }
 
-  def jsonStrToMap(jsonStr: String): Map[String, AnyVal] = {
+  def jsonStrToMap(jsonStr: String): Map[String, AnyRef] = {
     implicit val formats: DefaultFormats = org.json4s.DefaultFormats
-    parse(jsonStr).extract[Map[String, AnyVal]]
+    parse(jsonStr).extract[Map[String, AnyRef]]
   }
 
-  def collectJsonStats(): mutable.Map[String, AnyVal] = {
+  def collectJsonStats(): mutable.Map[String, AnyRef] = {
     val url = "http://localhost:9090/metrics/json/"
     // val json = scala.io.Source.fromURL(url).mkString
     val json = s"curl $url".!!
     val data = jsonStrToMap(json)
     val rs = data.-("counters", "meters", "histograms", "timers", "version")
-    val map = scala.collection.mutable.Map[String, AnyVal]()
+    val map = scala.collection.mutable.LinkedHashMap[String, AnyRef]()
     for ((k, v) <- rs) {
       if (k == "gauges") {
-        val data1 = v.asInstanceOf[Map[String, AnyVal]]
+        val data1 = v.asInstanceOf[Map[String, AnyRef]]
         for ((k, v) <- data1) {
-          val data2 = v.asInstanceOf[Map[String, AnyVal]].get("value")
+          val data2 = v.asInstanceOf[Map[String, AnyRef]].get("value")
           map.put(k, data2.get)
         }
       }
@@ -130,7 +122,8 @@ class SnappyMetricsSystemDUnitTest(s: String)
   }
 
   def doTestMetricsWhenClusterStarted(): Unit = {
-    var map = collectJsonStats()
+    val map = collectJsonStats()
+    var leadCount = scala.math.BigInt(2)
     for ((k, v) <- map) {
       if (containsWords(k, Array("MemberMetrics", "connectorCount"))) {
         assertEquals(scala.math.BigInt(0), v)}
@@ -139,9 +132,13 @@ class SnappyMetricsSystemDUnitTest(s: String)
       if (containsWords(k, Array("MemberMetrics", "locatorCount"))) {
         assertEquals(scala.math.BigInt(1), v)}
       if (containsWords(k, Array("MemberMetrics", "leadCount"))) {
-        assertEquals(scala.math.BigInt(2), v)}
+        if (v != leadCount) {
+          leadCount = scala.math.BigInt(1)
+          assertEquals(leadCount, v)
+        }
+      }
       if (containsWords(k, Array("MemberMetrics", "totalMembersCount"))) {
-        assertEquals(scala.math.BigInt(6), v)}
+        assertEquals(scala.math.BigInt(4) + leadCount, v)}
       if (containsWords(k, Array("TableMetrics", "embeddedTablesCount"))) {
         assertEquals(scala.math.BigInt(0), v)}
       if (containsWords(k, Array("TableMetrics", "externalTablesCount"))) {
diff --git a/cluster/src/dunit/scala/io/snappydata/cluster/SnappyRowStoreModeDUnit.scala b/cluster/src/dunit/scala/io/snappydata/cluster/SnappyRowStoreModeDUnit.scala
index 1dd495511e..8f3a798630 100644
--- a/cluster/src/dunit/scala/io/snappydata/cluster/SnappyRowStoreModeDUnit.scala
+++ b/cluster/src/dunit/scala/io/snappydata/cluster/SnappyRowStoreModeDUnit.scala
@@ -16,23 +16,16 @@
  */
 package io.snappydata.cluster
 
-import java.io.PrintWriter
-import java.nio.file.{Files, Paths}
 import java.sql.{Connection, DriverManager, SQLException}
 
 import io.snappydata.test.dunit.{AvailablePortHelper, DistributedTestBase}
-import io.snappydata.test.util.TestException
-import scala.sys.process._
-
-import com.pivotal.gemfirexd.TestUtil
 import org.junit.Assert
 
 import org.apache.spark.Logging
 import org.apache.spark.sql.collection.Utils
 
-class SnappyRowStoreModeDUnit (s: String) extends DistributedTestBase(s) with Logging {
-
-  private val snappyProductDir = getEnvironmentVariable("SNAPPY_HOME")
+class SnappyRowStoreModeDUnit (s: String) extends DistributedTestBase(s)
+    with ClusterUtils with Logging {
 
   val port: Int = AvailablePortHelper.getRandomAvailableTCPPort
   val netPort1: Int = AvailablePortHelper.getRandomAvailableTCPPort
@@ -41,14 +34,13 @@ class SnappyRowStoreModeDUnit (s: String) extends DistributedTestBase(s) with Lo
 
   override def beforeClass(): Unit = {
     super.beforeClass()
+
+    // stop any previous cluster and cleanup data
+    stopSnappyCluster()
+
     logInfo(s"Starting snappy rowstore cluster" +
         s" in $snappyProductDir/work with locator client port $netPort1")
 
-    // delete any old work directory
-    val workDir = new java.io.File(s"$snappyProductDir/work")
-    if (workDir.exists()) {
-      TestUtil.deleteDir(workDir)
-    }
     // create locators and servers files
     val confDir = s"$snappyProductDir/conf"
     writeToFile(s"localhost  -peer-discovery-port=$port -client-port=$netPort1",
@@ -57,34 +49,12 @@ class SnappyRowStoreModeDUnit (s: String) extends DistributedTestBase(s) with Lo
       s"""localhost  -locators=localhost[$port] -client-port=$netPort2
          |localhost  -locators=localhost[$port] -client-port=$netPort3
          |""".stripMargin, s"$confDir/servers")
-    (snappyProductDir + "/sbin/snappy-start-all.sh rowstore").!!
+    startSnappyCluster(startArgs = "rowstore")
   }
 
   override def afterClass(): Unit = {
     super.afterClass()
-
-    logInfo(s"Stopping snappy rowstore cluster in $snappyProductDir/work")
-    (snappyProductDir + "/sbin/snappy-stop-all.sh").!!
-    Files.deleteIfExists(Paths.get(snappyProductDir, "conf", "locators"))
-    Files.deleteIfExists(Paths.get(snappyProductDir, "conf", "leads"))
-    Files.deleteIfExists(Paths.get(snappyProductDir, "conf", "servers"))
-  }
-
-  def getEnvironmentVariable(env: String): String = {
-    val value = scala.util.Properties.envOrElse(env, null)
-    if (env == null) {
-      throw new TestException(s"Environment variable $env is not defined")
-    }
-    value
-  }
-
-  private def writeToFile(str: String, fileName: String): Unit = {
-    val pw = new PrintWriter(fileName)
-    try {
-      pw.write(str)
-    } finally {
-      pw.close()
-    }
+    stopSnappyCluster()
   }
 
   def getANetConnection(netPort: Int): Connection = {
diff --git a/cluster/src/dunit/scala/io/snappydata/cluster/SplitSnappyClusterDUnitTest.scala b/cluster/src/dunit/scala/io/snappydata/cluster/SplitSnappyClusterDUnitTest.scala
index 1d80bf0177..cf4d240114 100644
--- a/cluster/src/dunit/scala/io/snappydata/cluster/SplitSnappyClusterDUnitTest.scala
+++ b/cluster/src/dunit/scala/io/snappydata/cluster/SplitSnappyClusterDUnitTest.scala
@@ -20,12 +20,15 @@ import java.io.PrintWriter
 import java.net.InetAddress
 import java.nio.file.{Files, Paths}
 import java.util.Properties
+import java.util.concurrent.CyclicBarrier
 
+import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.duration.Duration
 import scala.concurrent.{Await, Future}
 import scala.language.postfixOps
 import scala.reflect.io.Path
 import scala.util.{Failure, Success, Try}
+
 import com.gemstone.gemfire.internal.cache.PartitionedRegion
 import com.pivotal.gemfirexd.internal.engine.Misc
 import io.snappydata.core.{TestData, TestData2}
@@ -33,6 +36,8 @@ import io.snappydata.test.dunit.{AvailablePortHelper, SerializableRunnable}
 import io.snappydata.util.TestUtils
 import io.snappydata.{ColumnUpdateDeleteTests, ConcurrentOpsTests, Property, SnappyTableStatsProviderService}
 import org.junit.Assert
+import org.scalatest.Assertions._
+
 import org.apache.spark.rdd.RDD
 import org.apache.spark.sql._
 import org.apache.spark.sql.catalyst.encoders.{ExpressionEncoder, RowEncoder}
@@ -58,8 +63,9 @@ class SplitSnappyClusterDUnitTest(s: String)
 
   val currentLocatorPort: Int = ClusterManagerTestBase.locPort
 
-  override protected val sparkProductDir: String =
-    testObject.getEnvironmentVariable("SNAPPY_HOME")
+  private val waitForSignal = new SerializableRunnable() {
+    override def run(): Unit = SplitSnappyClusterDUnitTest.opBarrier.await()
+  }
 
   override def beforeClass(): Unit = {
     // stop any existing SnappyContext to enable applying thrift-server properties
@@ -69,13 +75,13 @@ class SplitSnappyClusterDUnitTest(s: String)
     }
     super.beforeClass()
     startNetworkServers()
-    vm3.invoke(classOf[ClusterManagerTestBase], "startSparkCluster", sparkProductDir)
+    startSparkCluster(Some(vm3))
   }
 
   override def afterClass(): Unit = {
     Array(vm2, vm1, vm0, vm3).foreach(_.invoke(getClass, "stopNetworkServers"))
     ClusterManagerTestBase.stopNetworkServers()
-    vm3.invoke(classOf[ClusterManagerTestBase], "stopSparkCluster", sparkProductDir)
+    stopSparkCluster(Some(vm3))
     super.afterClass()
   }
 
@@ -255,7 +261,7 @@ class SplitSnappyClusterDUnitTest(s: String)
     if (jars.count() > 0) {
       var str = msg
       jars.collect().foreach(x => str += s"$x,")
-      assert(false, str)
+      fail(str)
     }
   }
 
@@ -317,7 +323,6 @@ class SplitSnappyClusterDUnitTest(s: String)
 
     assert(sns.sql("list packages").count() == 0)
 
-    import org.scalatest.Assertions._
     val thrown = intercept[Exception] {
       sns.sql("deploy package \"testsch\".mongo-###park_v1.5" +
           "  'org.mongodb.spark:mongo-spark-connector_2.11:2.2.2")
@@ -394,25 +399,24 @@ class SplitSnappyClusterDUnitTest(s: String)
     snc.sql(s"CREATE TABLE T5(COL1 STRING, COL2 STRING) USING column OPTIONS" +
         s" (key_columns 'col1', PARTITION_BY 'COL1', COLUMN_MAX_DELTA_ROWS '1')")
 
-    import scala.concurrent.ExecutionContext.Implicits.global
     val future = Future {
       vm3.invoke(getClass, "doTestStaleCatalog", startArgs :+ Int.box(locatorClientPort))
     }
 
     try {
-      // wait till the smart connector job perform at-least one putInto operation
+      // wait for smart connector job to perform at least one putInto operation
       var count = 0
-      while (snc.table("T5").count() == 0 && count < 10) {
-        Thread.sleep(4000)
+      while (snc.table("T5").count() == 0 && count < 200) {
+        Thread.sleep(200)
         count += 1
       }
-      assert(count != 10, "Smart connector application not performing putInto as expected.")
+      assert(count < 200, "Smart connector application not performing putInto as expected.")
 
       // perform DDL
       snc.sql(s"CREATE TABLE T6(COL1 STRING, COL2 STRING) " +
           s"USING column OPTIONS (PARTITION_BY 'COL1', COLUMN_MAX_DELTA_ROWS '1')")
 
-      Await.result(future, scala.concurrent.duration.Duration.apply(3, "min"))
+      Await.result(future, Duration(3, "min"))
     } finally {
       snc.sql("drop table if exists T6")
       snc.sql("drop table if exists T5")
@@ -422,7 +426,6 @@ class SplitSnappyClusterDUnitTest(s: String)
   def testStaleCatalogRetryForStreamingSink(): Unit = {
     val snc = SnappyContext(sc).newSession()
     snc.setConf(Property.TestDisableCodeGenFlag.name, "false")
-    import scala.concurrent.ExecutionContext.Implicits.global
     val testTempDirectory = "/tmp/SplitSnappyClusterDUnitTest"
 
     def cleanUp(): Unit = {
@@ -438,11 +441,11 @@ class SplitSnappyClusterDUnitTest(s: String)
     }
     try {
       var attempts = 0
-      while (!Files.exists(Paths.get(testTempDirectory, "file0")) && attempts < 15) {
-        Thread.sleep(4000)
+      while (!Files.exists(Paths.get(testTempDirectory, "file0")) && attempts < 300) {
+        Thread.sleep(200)
         attempts += 1
       }
-      assert(attempts < 14, "No data ingested by streaming application.")
+      assert(attempts < 300, "No data ingested by streaming application.")
 
       // perform DDL leading to stale catalog in smart connector application
       snc.sql(s"CREATE TABLE SYNC_TABLE(COL1 STRING) " + s"USING column")
@@ -451,7 +454,7 @@ class SplitSnappyClusterDUnitTest(s: String)
         write("dummydata")
         close()
       }
-      Await.result(future, Duration(2, "min"))
+      Await.result(future, Duration(3, "min"))
     } finally {
       cleanUp()
     }
@@ -466,25 +469,23 @@ class SplitSnappyClusterDUnitTest(s: String)
     snc.sql("insert into t5 values('2', '2')")
     snc.sql("insert into t5 values('3', '3')")
 
-    import scala.concurrent.ExecutionContext.Implicits.global
     val future = Future {
       vm3.invoke(getClass, "doTestStaleCatalogForSNAP3024", startArgs :+ Int.box(locatorClientPort))
     }
 
     try {
-      // wait till the smart connector job perform at-least one putInto operation
-      var count = 0
-      while (snc.table("T5").count() == 3 && count < 10) {
-        Thread.sleep(4000)
-        count += 1
-      }
-      assert(count != 10, "Smart connector application not performing putInto as expected.")
+      // wait for smart connector job to perform the insert operation
+      vm3.invoke(waitForSignal)
+      assert(snc.table("T5").count() > 3,
+        "Smart connector application not performing insert as expected.")
 
       // perform DDL
       snc.sql(s"CREATE TABLE T6(COL1 STRING, COL2 STRING) " +
           s"USING column OPTIONS (PARTITION_BY 'COL1', COLUMN_MAX_DELTA_ROWS '1')")
+      // signal vm3 to proceed
+      vm3.invoke(waitForSignal)
 
-      Await.result(future, scala.concurrent.duration.Duration.apply(3, "min"))
+      Await.result(future, Duration(3, "min"))
     } finally {
       snc.sql("drop table if exists T6")
       snc.sql("drop table if exists T5")
@@ -500,25 +501,23 @@ class SplitSnappyClusterDUnitTest(s: String)
     snc.sql("insert into t5 values('2', '2')")
     snc.sql("insert into t5 values('3', '3')")
 
-    import scala.concurrent.ExecutionContext.Implicits.global
     val future = Future {
       vm3.invoke(getClass,
         "doTestSmartConnectorForBucketRebalance", startArgs :+ Int.box(locatorClientPort))
     }
 
     try {
-      // wait till the smart connector job perform at-least one putInto operation
-      var count = 0
-      while (snc.table("T5").count() == 3 && count < 10) {
-        Thread.sleep(4000)
-        count += 1
-      }
-      assert(count != 10, "Smart connector application not performing putInto as expected.")
+      // wait for smart connector job to perform the insert operation
+      vm3.invoke(waitForSignal)
+      assert(snc.table("T5").count() > 3,
+        "Smart connector application not performing insert as expected.")
 
       // rebalance the buckets
       snc.sql(s"CALL SYS.REBALANCE_ALL_BUCKETS()")
+      // signal vm3 to proceed
+      vm3.invoke(waitForSignal)
 
-      Await.result(future, scala.concurrent.duration.Duration.apply(3, "min"))
+      Await.result(future, Duration(3, "min"))
     } finally {
       snc.sql("drop table if exists T6")
       snc.sql("drop table if exists T5")
@@ -547,25 +546,23 @@ class SplitSnappyClusterDUnitTest(s: String)
     snc.sql("insert into t5 values('2', '2')")
     snc.sql("insert into t5 values('3', '3')")
 
-    import scala.concurrent.ExecutionContext.Implicits.global
     val future = Future {
       vm3.invoke(getClass, "doTestInsertAfterStaleCatalog",
         startArgs :+ Int.box(locatorClientPort))
     }
 
     try {
-      // wait till the smart connector job perform at-least one putInto operation
-      var count = 0
-      while (snc.table("T5").count() == 3 && count < 10) {
-        Thread.sleep(4000)
-        count += 1
-      }
-      assert(count != 10, "Smart connector application not performing insert as expected.")
+      // wait for smart connector job to perform the insert operation
+      vm3.invoke(waitForSignal)
+      assert(snc.table("T5").count() > 3,
+        "Smart connector application not performing insert as expected.")
 
       logInfo("testInsertQueryAfterStaleCatalog dropping table t5")
       // drop the table and create a table with same name and different schema
       // create a table with different schema
       snc.sql("drop table t5")
+      // signal vm3 waiting for drop to proceed
+      vm3.invoke(waitForSignal)
       if (tableType == "COLUMN") {
         snc.sql(s"CREATE TABLE T5(COL1 DATE, COL2 DATE) USING column OPTIONS" +
             s" ( PARTITION_BY 'COL1', COLUMN_MAX_DELTA_ROWS '1')")
@@ -573,7 +570,7 @@ class SplitSnappyClusterDUnitTest(s: String)
         snc.sql(s"CREATE TABLE T5(COL1 DATE, COL2 DATE) USING row OPTIONS (partition_by 'col1')")
       }
 
-      Await.result(future, scala.concurrent.duration.Duration.apply(5, "min"))
+      Await.result(future, Duration(5, "min"))
     } finally {
       snc.sql("drop table if exists T5")
     }
@@ -588,28 +585,26 @@ class SplitSnappyClusterDUnitTest(s: String)
     snc.sql("insert into t6 values('2', '2')")
     snc.sql("insert into t6 values('3', '3')")
 
-    import scala.concurrent.ExecutionContext.Implicits.global
     val future = Future {
       vm3.invoke(getClass, "doTestDeleteAfterStaleCatalog",
         startArgs :+ Int.box(locatorClientPort))
     }
 
     try {
-      // wait till the smart connector job perform at-least one putInto operation
-      var count = 0
-      while (snc.table("T6").count() == 3 && count < 10) {
-        Thread.sleep(4000)
-        count += 1
-      }
-      assert(count != 10, "Smart connector application not performing delete as expected.")
+      // wait for smart connector job to perform the first delete operation
+      vm3.invoke(waitForSignal)
+      assert(snc.table("T6").count() < 3,
+        "Smart connector application not performing delete as expected.")
 
       logInfo("testDeleteAfterStaleCatalog dropping table t6")
       snc.sql("drop table t6")
+      // signal vm3 waiting for drop to proceed
+      vm3.invoke(waitForSignal)
       // create a table with different schema
       snc.sql(s"CREATE TABLE T6(COL1 DATE, COL2 DATE) USING column OPTIONS" +
           s" (key_columns 'COL1', PARTITION_BY 'COL1', COLUMN_MAX_DELTA_ROWS '1')")
 
-      Await.result(future, scala.concurrent.duration.Duration.apply(5, "min"))
+      Await.result(future, Duration(5, "min"))
     } finally {
       snc.sql("drop table if exists T6")
     }
@@ -624,25 +619,21 @@ class SplitSnappyClusterDUnitTest(s: String)
     snc.sql("insert into t7 values('2', '2')")
     snc.sql("insert into t7 values('3', '3')")
 
-    import scala.concurrent.ExecutionContext.Implicits.global
     val future = Future {
       vm3.invoke(getClass, "doTestUpdateAfterStaleCatalog",
         startArgs :+ Int.box(locatorClientPort))
     }
 
     try {
-      // wait till the smart connector job perform at-least one putInto operation
-      var count = 0
-      while (snc.table("T7").count() == 3 && count < 10) {
-        Thread.sleep(4000)
-        count += 1
-      }
-      assert(count != 10, "Smart connector application not performing delete as expected.")
+      // wait till the smart connector job perform the insert operation
+      vm3.invoke(waitForSignal)
+      assert(snc.table("T7").count() > 3,
+        "Smart connector application not performing update as expected.")
 
       snc.sql(s"CREATE TABLE T8(COL1 DATE, COL2 DATE) USING column OPTIONS" +
           s" (key_columns 'COL1', PARTITION_BY 'COL1', COLUMN_MAX_DELTA_ROWS '1')")
 
-      Await.result(future, scala.concurrent.duration.Duration.apply(5, "min"))
+      Await.result(future, Duration(5, "min"))
     } finally {
       snc.sql("drop table if exists T7")
       snc.sql("drop table if exists T8")
@@ -655,6 +646,8 @@ object SplitSnappyClusterDUnitTest
 
   private val locatorNetPort = AvailablePortHelper.getRandomAvailableTCPPort
 
+  private val opBarrier = new CyclicBarrier(2)
+
   def sc: SparkContext = {
     val context = ClusterManagerTestBase.sc
     context
@@ -665,8 +658,7 @@ object SplitSnappyClusterDUnitTest
     val catalog = session.sessionCatalog
     try {
       catalog.lookupRelation(session.tableIdentifier(tableName))
-      assert(assertion = false, s"Table $tableName should not exist in the " +
-          s"cached Hive catalog")
+      fail(s"Table $tableName should not exist in the cached Hive catalog")
     } catch {
       // expected exception
       case _: org.apache.spark.sql.TableNotFoundException =>
@@ -921,7 +913,7 @@ object SplitSnappyClusterDUnitTest
         .setMaster(s"spark://$hostName:7077")
         .set("spark.executor.cores", TestUtils.defaultCoresForSmartConnector)
         .set("spark.executor.extraClassPath",
-          getEnvironmentVariable("SNAPPY_DIST_CLASSPATH"))
+          ClusterUtils.getEnvironmentVariable("SNAPPY_DIST_CLASSPATH"))
         .set("spark.testing.reservedMemory", "0")
         .set("spark.sql.autoBroadcastJoinThreshold", "-1")
         .set("snappydata.connection", connectionURL)
@@ -940,7 +932,7 @@ object SplitSnappyClusterDUnitTest
     val mode = SnappyContext.getClusterMode(snc.sparkContext)
     mode match {
       case ThinClientConnectorMode(_, _) => // expected
-      case _ => assert(assertion = false, "cluster mode is " + mode)
+      case _ => fail("cluster mode is " + mode)
     }
 
     snc
@@ -1222,24 +1214,17 @@ object SplitSnappyClusterDUnitTest
     val dataFrame = snc.createDataFrame(rdd, schema)
     import org.apache.spark.sql.snappy._
     try {
-      Thread.sleep(2000)
-      for (_ <- 1 to 10) {
+      for (_ <- 1 to 50) {
         dataFrame.write.putInto("T5")
+        Thread.sleep(200)
       }
       Assert.fail("Should have thrown CatalogStaleException.")
     } catch {
       case _: CatalogStaleException =>
-        // Waiting for some time before retrying as catalog version is updated twice for create
-        // table. First time to create table and the another alter table operation is performed
-        // to populate primary keys. See `org.apache.spark.sql.SnappySession.createTableInternal`
-        // Since these two operations are not atomic, it was causing this test to fail
-        // intermittently. Adding this wait time to make sure that both operation is completed
-        // before retry.
-        // In our trouble shooting guide we have given code example with multiple retries and hence
-        // this should not be an issue if multiple retries are performed.
-        Thread.sleep(2000)
-        // retrying putInto operation and it should pass
-        dataFrame.write.putInto("T5")
+        // retrying of the putInto operation should pass
+        retryOperation(5) {
+          dataFrame.write.putInto("T5")
+        }
     }
   }
 
@@ -1266,8 +1251,11 @@ object SplitSnappyClusterDUnitTest
     val dataFrame = snc.createDataFrame(rdd, schema)
 
     dataFrame.write.insertInto("T5")
+    // signal the calling process
+    opBarrier.await()
+
     // wait for the embedded mode to change the catalog or rebalance buckets
-    Thread.sleep(6000)
+    opBarrier.await()
     // should not throw an exception
     for (_ <- 1 to 5) {
       snc.sql("select * from t5").collect()
@@ -1286,6 +1274,8 @@ object SplitSnappyClusterDUnitTest
     val snc: SnappyContext = getSnappyContextForConnector(locatorClientPort)
     snc.sql("insert into t5 values('4', '4')")
     logInfo("1. schema is = " + snc.table("T5").schema)
+    // signal the calling process
+    opBarrier.await()
 
     val schema2 = new StructType()
         .add(StructField("col1", DateType))
@@ -1298,20 +1288,17 @@ object SplitSnappyClusterDUnitTest
     )
     val dataFrame2 = snc.createDataFrame(rdd2, schema2)
 
-    logInfo("doTestInsertAfterStaleCatalog: Waiting 6 seconds to allow schema change")
-    Thread.sleep(6000)
+    // wait for table to be dropped
+    opBarrier.await()
     try {
-      for (_ <- 1 to 20) {
-        Thread.sleep(500)
-        logInfo("calling dataFrame.write.insertInto(\"T5\")")
-        logInfo("2. schema is = " + snc.table("T5").schema)
-        dataFrame2.write.insertInto("T5")
-      }
+      logInfo("calling dataFrame.write.insertInto(\"T5\")")
+      // logInfo("2. schema is = " + snc.table("T5").schema)
+      dataFrame2.write.insertInto("T5")
       Assert.fail("Should have thrown CatalogStaleException.")
     } catch {
       case _: CatalogStaleException =>
         logInfo("doTestInsertAfterStaleCatalog: Caught expected CatalogStaleException")
-        // retrying insertInto operation and it should pass
+        // retry of the insertInto operation should pass
         retryOperation(5) {
           dataFrame2.write.insertInto("T5")
         }
@@ -1337,6 +1324,20 @@ object SplitSnappyClusterDUnitTest
           } else {
             Thread.sleep(200)
           }
+        // Waiting for some time before retrying as catalog version is updated twice for create
+        // table. First time to create table and the another alter table operation is performed
+        // to populate primary keys. See `org.apache.spark.sql.SnappySession.createTableInternal`
+        // Since these two operations are not atomic, it was causing this test to fail
+        // intermittently. Adding this wait time to make sure that both operation is completed
+        // before retry.
+        // In our trouble shooting guide we have given code example with multiple retries and hence
+        // this should not be an issue if multiple retries are performed.
+        case t: Exception =>
+          if (retryCount == 0) {
+            Thread.sleep(2000)
+          } else {
+            throw t
+          }
       }
     }
   }
@@ -1346,19 +1347,18 @@ object SplitSnappyClusterDUnitTest
       locatorClientPort: Int): Unit = {
     val snc: SnappyContext = getSnappyContextForConnector(locatorClientPort)
     snc.sql("delete from t6 where col1 like '1%'")
+    // signal the calling process
+    opBarrier.await()
 
-    logInfo("doTestDeleteAfterStaleCatalog: Waiting 6 seconds to allow schema change")
-    Thread.sleep(6000)
+    // wait for table to be dropped
+    opBarrier.await()
     try {
-      for (_ <- 1 to 20) {
-        Thread.sleep(500)
-        snc.sql("delete from t6 where col1 like '2%'")
-      }
+      snc.sql("delete from t6 where col1 like '2%'")
       Assert.fail("Should have thrown CatalogStaleException.")
     } catch {
       case _: CatalogStaleException =>
         logInfo("doTestDeleteAfterStaleCatalog: Caught expected CatalogStaleException")
-        // retrying delete from operation and it should pass
+        // retry of the delete operation should pass
         retryOperation(5) {
           snc.sql("delete from t6 where col1 like '2%'")
         }
@@ -1370,19 +1370,19 @@ object SplitSnappyClusterDUnitTest
       locatorClientPort: Int): Unit = {
     val snc: SnappyContext = getSnappyContextForConnector(locatorClientPort)
     snc.sql("insert into t7 values('4', '4')")
+    // signal the calling process
+    opBarrier.await()
 
-    logInfo("doTestUpdateAfterStaleCatalog: Waiting 6 seconds to allow schema change")
-    Thread.sleep(6000)
     try {
-      for (_ <- 1 to 20) {
-        Thread.sleep(500)
+      for (_ <- 1 to 50) {
         snc.sql("update t7 set col2 = '22' where col1 = '2'")
+        Thread.sleep(200)
       }
       Assert.fail("Should have thrown CatalogStaleException.")
     } catch {
       case _: CatalogStaleException =>
         logInfo("doTestUpdateAfterStaleCatalog: Caught expected CatalogStaleException")
-        // retrying delete from operation and it should pass
+        // retry of the update operation should pass
         retryOperation(5) {
           snc.sql("update t7 set col2 = '22' where col1 = '2'")
         }
@@ -1438,12 +1438,12 @@ object SplitSnappyClusterDUnitTest
 
       // wait till DDL is fired on snappy cluster which will lead to stale smart-connector catalog
       var attempts = 0
-      while (!Files.exists(Paths.get(testTempDir, "file1")) && attempts < 15) {
-        Thread.sleep(4000)
+      while (!Files.exists(Paths.get(testTempDir, "file1")) && attempts < 150) {
+        Thread.sleep(500)
         attempts += 1
       }
 
-      assert(attempts < 14, "Waiting for stale catalog timed out")
+      assert(attempts < 150, "Waiting for stale catalog timed out")
 
       // produce second batch of data
       val dataBatch2 = Seq(Seq(3, "name3", 20))
@@ -1475,9 +1475,8 @@ object SplitSnappyClusterDUnitTest
         s"where stream_query_id = '$queryName'"
     val batchIdFromTable = snc.sql(sql).collect()
     if (batchIdFromTable.isEmpty || batchIdFromTable(0)(0) != batchId) {
-      Thread.sleep(1000)
+      Thread.sleep(500)
       waitTillTheBatchIsPickedForProcessing(snc, batchId, queryName, retries - 1)
     }
   }
 }
-
diff --git a/cluster/src/dunit/scala/io/snappydata/externalstore/JDBCMetadataCaseDUnitTest.scala b/cluster/src/dunit/scala/io/snappydata/externalstore/JDBCMetadataCaseDUnitTest.scala
index 79a88d640b..0ab4a6dd67 100644
--- a/cluster/src/dunit/scala/io/snappydata/externalstore/JDBCMetadataCaseDUnitTest.scala
+++ b/cluster/src/dunit/scala/io/snappydata/externalstore/JDBCMetadataCaseDUnitTest.scala
@@ -18,11 +18,9 @@ package io.snappydata.externalstore
 
 import java.sql.{Connection, DatabaseMetaData}
 
-import scala.util.Try
-
 import com.pivotal.gemfirexd.internal.impl.jdbc.EmbedDatabaseMetaData.METADATACASE_LOWER_PROP
 import io.snappydata.cluster.ClusterManagerTestBase
-import io.snappydata.test.dunit.AvailablePortHelper
+import io.snappydata.test.dunit.{AvailablePortHelper, DistributedTestBase, SerializableRunnable}
 import org.junit.Assert.assertEquals
 
 import org.apache.spark.Logging
@@ -32,17 +30,26 @@ class JDBCMetadataCaseDUnitTest(s: String) extends ClusterManagerTestBase(s)
 
   val netPort1 = AvailablePortHelper.getRandomAvailableTCPPort
 
-  sysProps.put(METADATACASE_LOWER_PROP, "true")
-
   // using mixed case name to cover case insensitivity scenarios
   private val table1 = "tABle1"
   private val table2 = "tABle2"
   private val table3 = "tABle3"
   val schema = "Schema1"
 
+  override def beforeClass(): Unit = {
+    super.beforeClass()
+    System.setProperty(METADATACASE_LOWER_PROP, "true")
+    DistributedTestBase.invokeInEveryVM(new SerializableRunnable() {
+      override def run(): Unit = System.setProperty(METADATACASE_LOWER_PROP, "true")
+    })
+  }
+
   override def afterClass(): Unit = {
     super.afterClass()
-    sysProps.remove(METADATACASE_LOWER_PROP)
+    System.clearProperty(METADATACASE_LOWER_PROP)
+    DistributedTestBase.invokeInEveryVM(new SerializableRunnable() {
+      override def run(): Unit = System.clearProperty(METADATACASE_LOWER_PROP)
+    })
   }
 
   def testJDBCMetadataCase_queryRoutingOn(): Unit = {
@@ -51,10 +58,6 @@ class JDBCMetadataCaseDUnitTest(s: String) extends ClusterManagerTestBase(s)
     try {
       val stmt = conn.createStatement()
       try {
-        stmt.execute("drop table if exists " + table1)
-        stmt.execute("drop table if exists " + table2)
-        stmt.execute("drop table if exists " + table3)
-        stmt.execute("drop schema if exists " + schema)
         stmt.execute("create schema " + schema)
         stmt.execute("create table " + schema + "." + table1 +
             "(id integer primary key, col1 string, col2 long)")
@@ -67,7 +70,7 @@ class JDBCMetadataCaseDUnitTest(s: String) extends ClusterManagerTestBase(s)
 
       // JDBC metadata APIs should return result in lower case when query routing is true
       // i.e. for external connections
-      testMetadataAPIs(dbmd, (s: String) => s.toLowerCase, true)
+      testMetadataAPIs(dbmd, (s: String) => s.toLowerCase, checkShortTableType = true)
 
     } finally {
       cleanup(conn)
@@ -84,12 +87,7 @@ class JDBCMetadataCaseDUnitTest(s: String) extends ClusterManagerTestBase(s)
     try {
       val stmt = conn.createStatement()
       try {
-//        stmt.execute("drop schema if exists " + schema)
-        Try(stmt.execute("drop table " + table1))
-
-        Try(stmt.execute("drop table " + table2))
-        Try(stmt.execute("drop table " + table3))
-        Try(stmt.execute("create schema " + schema))
+        stmt.execute("create schema " + schema)
         stmt.execute("create table " + schema + "." + table1 +
             "(id integer primary key, col1 string, col2 long)")
         stmt.execute("create table " + schema + "." + table2 + "(id integer , fs string)")
@@ -127,7 +125,7 @@ class JDBCMetadataCaseDUnitTest(s: String) extends ClusterManagerTestBase(s)
       val createParams = typeInfoRS.getString("CREATE_PARAMS")
       val localTypeName = typeInfoRS.getString("LOCAL_TYPE_NAME")
 
-      println(s"Type info - typeName:$typeName, literalPrefix:$literalPrefix," +
+      logInfo(s"Type info - typeName:$typeName, literalPrefix:$literalPrefix," +
           s" literalSuffix:$literalSuffix, createParam:$createParams," +
           s" localTypeName:$localTypeName")
 
@@ -168,7 +166,7 @@ class JDBCMetadataCaseDUnitTest(s: String) extends ClusterManagerTestBase(s)
       val isAutoIncrement = columnsRS.getString("IS_AUTOINCREMENT")
       val isNullable = columnsRS.getString("IS_AUTOINCREMENT")
 
-      println(s"Column details - columnName:$columnName, tableName:$tableName," +
+      logInfo(s"Column details - columnName:$columnName, tableName:$tableName," +
           s" schemaName:$schemaName, typeName:$typeName," +
           s" isAutoIncrement:$isAutoIncrement, isNullable:$isNullable ")
 
@@ -241,10 +239,11 @@ class JDBCMetadataCaseDUnitTest(s: String) extends ClusterManagerTestBase(s)
 
   private def cleanup(conn: Connection): Unit = {
     val stmt = conn.createStatement()
-    Try(stmt.execute("drop table " + table1))
-    Try(stmt.execute("drop table " + table2))
-    Try(stmt.execute("drop table " + table3))
-    Try(stmt.execute("drop schema " + schema))
+    stmt.execute(s"drop table if exists $schema.$table1")
+    stmt.execute(s"drop table if exists $schema.$table2")
+    stmt.execute(s"drop table if exists $table3")
+    // executed with and without query-routing=false, hence explicit "restrict"
+    stmt.execute(s"drop schema if exists $schema restrict")
     stmt.close()
     conn.close()
   }
diff --git a/cluster/src/dunit/scala/io/snappydata/externalstore/JDBCPreparedStatementDUnitTest.scala b/cluster/src/dunit/scala/io/snappydata/externalstore/JDBCPreparedStatementDUnitTest.scala
index ffd41ffc30..2cb71e835e 100644
--- a/cluster/src/dunit/scala/io/snappydata/externalstore/JDBCPreparedStatementDUnitTest.scala
+++ b/cluster/src/dunit/scala/io/snappydata/externalstore/JDBCPreparedStatementDUnitTest.scala
@@ -18,7 +18,7 @@ package io.snappydata.externalstore
 
 import java.sql.{PreparedStatement, SQLException}
 import java.util.concurrent.atomic.AtomicInteger
-import java.util.concurrent.{CountDownLatch, Executors, TimeoutException}
+import java.util.concurrent.{CountDownLatch, CyclicBarrier, Executors, TimeoutException}
 
 import scala.concurrent.{Await, ExecutionContext, ExecutionContextExecutor, Future}
 import scala.util.Try
@@ -463,23 +463,26 @@ class JDBCPreparedStatementDUnitTest(s: String) extends ClusterManagerTestBase(s
     stmt.execute(
       s"""create table $table (col1 int, col2  int) using column as
         |select id as col1, id as col2 from range(10000000)""".stripMargin)
+    val barrier = new CyclicBarrier(2)
     try {
       implicit val context: ExecutionContextExecutor =
         ExecutionContext.fromExecutor(Executors.newSingleThreadExecutor())
       val f = Future {
         println("Firing select...")
         try {
-          stmt.executeQuery(s"select avg(col1) from $table group by col2")
+          barrier.await()
+          stmt.executeQuery(s"select avg(col1) from $table group by col2 order by col2")
           println("Firing select... Done.")
-          Assert.fail("The query execution should have cancelled.")
+          // Assert.fail("The query execution should have cancelled.")
         } catch {
           case e: SQLException =>
             val expectedMessage = "The statement has been cancelled due to a user request."
             assert("XCL56".equals(e.getSQLState) && e.getMessage.contains(expectedMessage))
         }
       }
+      barrier.await()
       // wait for select query submission
-      Thread.sleep(3000)
+      Thread.sleep(1000)
       println("Firing cancel")
       stmt.cancel()
       println("Firing cancel... Done")
@@ -487,7 +490,7 @@ class JDBCPreparedStatementDUnitTest(s: String) extends ClusterManagerTestBase(s
       import scala.concurrent.duration._
       println("Awaiting result of the future.")
       try {
-        Await.result(f, 10.seconds)
+        Await.result(f, 60.seconds)
       } catch {
         case _: TimeoutException => Assert.fail("Query didn't get cancelled in stipulated time.")
       }
diff --git a/cluster/src/dunit/scala/org/apache/spark/memory/SnappyUnifiedMemoryManagerDUnitTest.scala b/cluster/src/dunit/scala/org/apache/spark/memory/SnappyUnifiedMemoryManagerDUnitTest.scala
index de1ac83d6c..cdab72c1e7 100644
--- a/cluster/src/dunit/scala/org/apache/spark/memory/SnappyUnifiedMemoryManagerDUnitTest.scala
+++ b/cluster/src/dunit/scala/org/apache/spark/memory/SnappyUnifiedMemoryManagerDUnitTest.scala
@@ -109,9 +109,11 @@ class SnappyUnifiedMemoryManagerDUnitTest(s: String) extends ClusterManagerTestB
   }
 
   private def cleanTestResources(): Unit = {
-    val snc = SnappyContext(sc).newSession()
-    snc.dropTable(col_table, ifExists = true)
-    snc.dropTable(rr_table, ifExists = true)
+    val snc = SnappyContext(sc)
+    if (snc ne null) {
+      snc.dropTable(col_table, ifExists = true)
+      snc.dropTable(rr_table, ifExists = true)
+    }
     resetMemoryManagers
   }
 
diff --git a/cluster/src/dunit/scala/org/apache/spark/sql/ColumnBatchAndExternalTableDUnitTest.scala b/cluster/src/dunit/scala/org/apache/spark/sql/ColumnBatchAndExternalTableDUnitTest.scala
index 2dd02d66a8..d4d77d4e5a 100644
--- a/cluster/src/dunit/scala/org/apache/spark/sql/ColumnBatchAndExternalTableDUnitTest.scala
+++ b/cluster/src/dunit/scala/org/apache/spark/sql/ColumnBatchAndExternalTableDUnitTest.scala
@@ -346,21 +346,21 @@ class ColumnBatchAndExternalTableDUnitTest(s: String) extends ClusterManagerTest
     activeTasks = 0
     stmt.execute("select avg(depDelay) from airline")
     // should not deviate much though in rare cases few tasks can start/end slightly out of order
-    assert(maxTasksStarted < sparkCores * 2)
-    assert(maxTasksStarted > sparkCores / 2)
+    assertMaxTasksStarted(maxTasksStarted, sparkCores * 2)
+    assertMinTasksStarted(maxTasksStarted, sparkCores / 2)
     maxTasksStarted = 0
     activeTasks = 0
     stmt.execute("select avg(depDelay) from airline")
-    assert(maxTasksStarted < sparkCores * 2)
-    assert(maxTasksStarted > sparkCores / 2)
+    assertMaxTasksStarted(maxTasksStarted, sparkCores * 2)
+    assertMinTasksStarted(maxTasksStarted, sparkCores / 2)
 
     // now check that max tasks are reduced with the session setting
     stmt.execute("set spark.task.cpus = 2")
     maxTasksStarted = 0
     activeTasks = 0
     stmt.execute("select avg(depDelay) from airline")
-    assert(maxTasksStarted < sparkCores)
-    assert(maxTasksStarted > sparkCores / 4)
+    assertMaxTasksStarted(maxTasksStarted, sparkCores)
+    assertMinTasksStarted(maxTasksStarted, sparkCores / 4)
 
     // ---- Check implicit spark.task.cpus get set for file scans/inserts ----
     logInfo(s"Expected implicit spark.task.cpus = $implicitCpusToTasks")
@@ -368,27 +368,27 @@ class ColumnBatchAndExternalTableDUnitTest(s: String) extends ClusterManagerTest
     maxTasksStarted = 0
     activeTasks = 0
     stmt.execute("select avg(depDelay) from airline")
-    assert(maxTasksStarted < sparkCores * 2)
-    assert(maxTasksStarted > sparkCores / 2)
+    assertMaxTasksStarted(maxTasksStarted, sparkCores * 2)
+    assertMinTasksStarted(maxTasksStarted, sparkCores / 2)
 
     maxTasksStarted = 0
     activeTasks = 0
     stmt.execute("select avg(depDelay) from airline_staging")
-    assert(maxTasksStarted < sparkCores * 2 / implicitCpusToTasks)
-    assert(maxTasksStarted > sparkCores / (2 * implicitCpusToTasks))
+    assertMaxTasksStarted(maxTasksStarted, sparkCores * 2 / implicitCpusToTasks)
+    assertMinTasksStarted(maxTasksStarted, sparkCores / (2 * implicitCpusToTasks))
     maxTasksStarted = 0
     activeTasks = 0
     stmt.execute("select avg(depDelay) from airline_staging")
-    assert(maxTasksStarted < sparkCores * 2 / implicitCpusToTasks)
-    assert(maxTasksStarted > sparkCores / (2 * implicitCpusToTasks))
+    assertMaxTasksStarted(maxTasksStarted, sparkCores * 2 / implicitCpusToTasks)
+    assertMinTasksStarted(maxTasksStarted, sparkCores / (2 * implicitCpusToTasks))
 
     // ---- Check explicit spark.task.cpus overrides implicit spark.task.cpus ----
     stmt.execute("set spark.task.cpus = 1")
     maxTasksStarted = 0
     activeTasks = 0
     stmt.execute("select avg(depDelay) from airline_staging")
-    assert(maxTasksStarted < sparkCores * 2)
-    assert(maxTasksStarted > sparkCores / 2)
+    assertMaxTasksStarted(maxTasksStarted, sparkCores * 2)
+    assertMinTasksStarted(maxTasksStarted, sparkCores / 2)
 
     stmt.execute("drop table airline_staging")
     stmt.execute("drop table airline")
@@ -398,6 +398,19 @@ class ColumnBatchAndExternalTableDUnitTest(s: String) extends ClusterManagerTest
     stmt.close()
     conn.close()
   }
+
+  private def assertMaxTasksStarted(max: Int, expected: Int): Unit = {
+    // occasionally a few tasks more than expected might get started due to gap between
+    // notification and job submissions
+    assert(max - expected <= TestUtils.defaultCores / 2,
+      s"Upper limit of concurrent tasks = $expected, actual = $max")
+  }
+
+  private def assertMinTasksStarted(max: Int, expected: Int): Unit = {
+    // lower limit might get violated due to the gap between notification and job submissions
+    assert(expected - max <= TestUtils.defaultCores / 2,
+      s"Lower limit of concurrent tasks = $expected, actual = $max")
+  }
 }
 
 case class AirlineData(year: Int, month: Int, dayOfMonth: Int,
diff --git a/cluster/src/dunit/scala/org/apache/spark/sql/NorthWindDUnitTest.scala b/cluster/src/dunit/scala/org/apache/spark/sql/NorthWindDUnitTest.scala
index f48a70ee9d..28247bbff3 100644
--- a/cluster/src/dunit/scala/org/apache/spark/sql/NorthWindDUnitTest.scala
+++ b/cluster/src/dunit/scala/org/apache/spark/sql/NorthWindDUnitTest.scala
@@ -19,9 +19,9 @@ package org.apache.spark.sql
 import java.io.{File, FileOutputStream, PrintWriter}
 import java.sql.{ResultSet, Statement}
 
-import scala.io.Source
+import scala.io.{Codec, Source}
 
-import io.snappydata.cluster.ClusterManagerTestBase
+import io.snappydata.cluster.{ClusterManagerTestBase, ClusterUtils}
 import io.snappydata.test.dunit.AvailablePortHelper
 
 import org.apache.spark.TaskContext
@@ -32,17 +32,15 @@ import org.apache.spark.sql.execution.joins._
 import org.apache.spark.sql.execution.row.RowTableScan
 import org.apache.spark.sql.execution.{FilterExec, ProjectExec}
 
-class NorthWindDUnitTest(s: String) extends ClusterManagerTestBase(s) {
+class NorthWindDUnitTest(s: String) extends ClusterManagerTestBase(s) with ClusterUtils {
 
   override val locatorNetPort: Int = AvailablePortHelper.getRandomAvailableTCPPort
-  protected val productDir: String = SmartConnectorFunctions.getEnvironmentVariable("SNAPPY_HOME")
   override val stopNetServersInTearDown = false
 
-
   override def beforeClass(): Unit = {
     super.beforeClass()
     startNetworkServersOnAllVMs()
-    vm3.invoke(classOf[ClusterManagerTestBase], "startSparkCluster", productDir)
+    startSparkCluster(Some(vm3))
   }
 
   override def afterClass(): Unit = {
@@ -51,7 +49,7 @@ class NorthWindDUnitTest(s: String) extends ClusterManagerTestBase(s) {
     super.afterClass()
     Array(vm0, vm1, vm2).foreach(_.invoke(classOf[ClusterManagerTestBase],
       "validateNoActiveSnapshotTX"))
-    vm3.invoke(classOf[ClusterManagerTestBase], "stopSparkCluster", productDir)
+    stopSparkCluster(Some(vm3))
   }
 
   def testReplicatedTableQueries(): Unit = {
@@ -770,10 +768,10 @@ object NorthWindDUnitTest {
       writeToFile(sparkDF, sparkFile, snc)
       pw.println(s"$queryNum Result Collected in files with prefix $sparkFile")
     }
-    val expectedFiles = getSortedFiles(sparkFile).toIterator
-    val actualFiles = getSortedFiles(snappyFile).toIterator
-    val expectedLineSet = expectedFiles.flatMap(Source.fromFile(_).getLines())
-    val actualLineSet = actualFiles.flatMap(Source.fromFile(_).getLines())
+    val expectedSources = getSortedFiles(sparkFile).toIterator.map(Source.fromFile(_)(Codec.UTF8))
+    val actualSources = getSortedFiles(snappyFile).toIterator.map(Source.fromFile(_)(Codec.UTF8))
+    val expectedLineSet = expectedSources.flatMap(_.getLines())
+    val actualLineSet = actualSources.flatMap(_.getLines())
     var numLines = 0
     while (expectedLineSet.hasNext && actualLineSet.hasNext) {
       val expectedLine = expectedLineSet.next()
@@ -798,6 +796,9 @@ object NorthWindDUnitTest {
         s"observed: Expected=$numRows, Got=$numLines")
     // scalastyle:on println
     pw.flush()
+
+    expectedSources.foreach(_.close())
+    actualSources.foreach(_.close())
   }
 
   def assertJoinFullResultSet(snc: SnappyContext, sqlString: String, numRows: Int,
diff --git a/cluster/src/dunit/scala/org/apache/spark/sql/SmartConnectorFunctions.scala b/cluster/src/dunit/scala/org/apache/spark/sql/SmartConnectorFunctions.scala
index ed7d3456d0..098ebfeaf8 100644
--- a/cluster/src/dunit/scala/org/apache/spark/sql/SmartConnectorFunctions.scala
+++ b/cluster/src/dunit/scala/org/apache/spark/sql/SmartConnectorFunctions.scala
@@ -20,7 +20,8 @@ import java.io.{File, FileOutputStream, PrintWriter}
 import java.net.InetAddress
 
 import io.snappydata.benchmark.TPCHColumnPartitionedTable
-import io.snappydata.test.util.TestException
+import io.snappydata.cluster.ClusterUtils
+
 import org.apache.spark.rdd.ZippedPartitionsPartition
 import org.apache.spark.sql.catalyst.plans.physical.SinglePartition
 import org.apache.spark.sql.collection.MultiBucketExecutorPartition
@@ -62,20 +63,15 @@ object SmartConnectorFunctions {
     TPCHUtils.createAndLoadTables(snc, isSnappy = true)
   }
 
-  def getEnvironmentVariable(env: String): String = {
-    val value = scala.util.Properties.envOrElse(env, null)
-    if (env == null) {
-      throw new TestException(s"Environment variable $env is not defined")
-    }
-    value
-  }
+  def getEnvironmentVariable(name: String): String = ClusterUtils.getEnvironmentVariable(name)
+
   def nwQueryValidationOnConnector(locatorNetPort: Int, tableType: String): Unit = {
     val hostName = InetAddress.getLocalHost.getHostName
     val conf = new SparkConf()
         .setAppName("test Application")
         .setMaster(s"spark://$hostName:7077")
         .set("spark.executor.extraClassPath",
-          SmartConnectorFunctions.getEnvironmentVariable("SNAPPY_DIST_CLASSPATH"))
+          getEnvironmentVariable("SNAPPY_DIST_CLASSPATH"))
         .set("snappydata.connection", s"localhost:$locatorNetPort")
 
     val sc = SparkContext.getOrCreate(conf)
diff --git a/cluster/src/dunit/scala/org/apache/spark/sql/TPCHDUnitTest.scala b/cluster/src/dunit/scala/org/apache/spark/sql/TPCHDUnitTest.scala
index 5192fc1bc9..6fdb5600ed 100644
--- a/cluster/src/dunit/scala/org/apache/spark/sql/TPCHDUnitTest.scala
+++ b/cluster/src/dunit/scala/org/apache/spark/sql/TPCHDUnitTest.scala
@@ -24,32 +24,29 @@ import scala.collection.mutable.{ArrayBuffer, ListBuffer}
 import io.snappydata.benchmark.TPCH_Queries.createQuery
 import io.snappydata.benchmark.snappy.tpch.QueryExecutor
 import io.snappydata.benchmark.{TPCHColumnPartitionedTable, TPCHReplicatedTable, TPCH_Queries}
-import io.snappydata.cluster.ClusterManagerTestBase
+import io.snappydata.cluster.{ClusterManagerTestBase, ClusterUtils}
 import io.snappydata.test.dunit.AvailablePortHelper
 
 import org.apache.spark.{Logging, SparkContext}
 
-class TPCHDUnitTest(s: String) extends ClusterManagerTestBase(s)
-    with Logging {
+class TPCHDUnitTest(s: String) extends ClusterManagerTestBase(s) with ClusterUtils with Logging {
 
   override val locatorNetPort: Int = TPCHUtils.locatorNetPort
+
   val queries = Array("1", "2", "3", "4", "5", "6", "7", "8", "9",
     "10", "11", "12", "13", "14", "15", "16", "17", "18", "19",
     "20", "21", "22")
   override val stopNetServersInTearDown = false
 
-  protected val productDir =
-    SmartConnectorFunctions.getEnvironmentVariable("SNAPPY_HOME")
-
   override def beforeClass(): Unit = {
-    vm3.invoke(classOf[ClusterManagerTestBase], "startSparkCluster", productDir)
+    startSparkCluster(Some(vm3))
     super.beforeClass()
     startNetworkServersOnAllVMs()
   }
 
   override def afterClass(): Unit = {
     try {
-      vm3.invoke(classOf[ClusterManagerTestBase], "stopSparkCluster", productDir)
+      stopSparkCluster(Some(vm3))
       Array(vm2, vm1, vm0).foreach(_.invoke(getClass, "stopNetworkServers"))
       ClusterManagerTestBase.stopNetworkServers()
     } finally {
@@ -561,7 +558,7 @@ class TPCHDUnitTest(s: String) extends ClusterManagerTestBase(s)
       }
       result += row
     }
-    println(s"Number of rows : $count")
+    logInfo(s"Number of rows : $count")
 
     val expectedFile = sc.textFile(getClass.getResource(
       s"/TPCH/RESULT/Snappy_10.out").getPath)
diff --git a/cluster/src/main/scala/org/apache/spark/memory/SnappyUnifiedMemoryManager.scala b/cluster/src/main/scala/org/apache/spark/memory/SnappyUnifiedMemoryManager.scala
index 81c3a13011..f022f6ad84 100644
--- a/cluster/src/main/scala/org/apache/spark/memory/SnappyUnifiedMemoryManager.scala
+++ b/cluster/src/main/scala/org/apache/spark/memory/SnappyUnifiedMemoryManager.scala
@@ -386,6 +386,7 @@ class SnappyUnifiedMemoryManager private[memory](
       if (SnappyMemoryUtils.isCriticalUp) {
         logWarning(s"CRTICAL_UP event raised due to critical heap memory usage. " +
             s"No memory allocated to thread ${Thread.currentThread()}")
+        logStats("CRITICAL_UP:")
         return false
       }
     }
diff --git a/cluster/src/main/scala/org/apache/spark/util/LocalDirectoryCleanupUtil.scala b/cluster/src/main/scala/org/apache/spark/util/LocalDirectoryCleanupUtil.scala
index 27125beb67..0b2867b5cb 100644
--- a/cluster/src/main/scala/org/apache/spark/util/LocalDirectoryCleanupUtil.scala
+++ b/cluster/src/main/scala/org/apache/spark/util/LocalDirectoryCleanupUtil.scala
@@ -21,7 +21,7 @@ import java.io.File
 import java.nio.file.{Files, Path, Paths}
 
 import scala.collection.JavaConverters._
-import scala.io.Source
+import scala.io.{Codec, Source}
 
 import com.gemstone.gemfire.internal.shared.ClientSharedUtils
 import org.apache.commons.io.FileUtils
@@ -55,7 +55,7 @@ object LocalDirectoryCleanupUtil extends Logging {
   def clean(): Unit = synchronized {
     val listFilePath = Paths.get(listFile)
     if (Files.exists(listFilePath)) {
-      val fileSource = Source.fromFile(listFile, "UTF-8")
+      val fileSource = Source.fromFile(listFile)(Codec.UTF8)
       try {
         fileSource.getLines().map(Paths.get(_)).foreach(delete)
       } finally {
diff --git a/cluster/src/test/scala/io/snappydata/benchmark/snappy/TPCDSSuite.scala b/cluster/src/test/scala/io/snappydata/benchmark/snappy/TPCDSSuite.scala
index a930b8a980..d5f6423a1c 100644
--- a/cluster/src/test/scala/io/snappydata/benchmark/snappy/TPCDSSuite.scala
+++ b/cluster/src/test/scala/io/snappydata/benchmark/snappy/TPCDSSuite.scala
@@ -71,7 +71,7 @@ class TPCDSSuite extends SnappyFunSuite
       val sc = new SparkContext(conf)
       TPCDSQuerySnappyBenchmark.snappy = new SnappySession(sc)
       val dataLocation = "/export/shared/QA_DATA/TPCDS/data"
-      val snappyHome = System.getenv("SNAPPY_HOME")
+      val snappyHome = System.getProperty("SNAPPY_HOME")
       val snappyRepo = s"$snappyHome/../../.."
 
       TPCDSQuerySnappyBenchmark.execute(dataLocation,
@@ -87,7 +87,7 @@ class TPCDSSuite extends SnappyFunSuite
     if (runTPCDSSuite.equalsIgnoreCase("true")) {
       TPCDSQuerySnappyBenchmark.spark = SparkSession.builder.config(conf).getOrCreate()
       val dataLocation = "/export/shared/QA_DATA/TPCDS/data"
-      val snappyHome = System.getenv("SNAPPY_HOME")
+      val snappyHome = System.getProperty("SNAPPY_HOME")
       val snappyRepo = s"$snappyHome/../../..";
 
       TPCDSQuerySnappyBenchmark.execute(dataLocation,
diff --git a/cluster/src/test/scala/org/apache/spark/memory/MemoryManagerStatsSuite.scala b/cluster/src/test/scala/org/apache/spark/memory/MemoryManagerStatsSuite.scala
index 2c668a8251..c1bb40022d 100644
--- a/cluster/src/test/scala/org/apache/spark/memory/MemoryManagerStatsSuite.scala
+++ b/cluster/src/test/scala/org/apache/spark/memory/MemoryManagerStatsSuite.scala
@@ -16,15 +16,14 @@
  */
 package org.apache.spark.memory
 
-import io.snappydata.test.dunit.DistributedTestBase.InitializeRun
+import com.pivotal.gemfirexd.TestUtil
 
 import org.apache.spark.SparkEnv
 import org.apache.spark.sql.{SnappySession, SparkSession}
 
-
 class MemoryManagerStatsSuite extends MemoryFunSuite {
 
-  InitializeRun.setUp()
+  TestUtil.globalSetUp()
 
   test("Test heap stats") {
     val offHeap = false
diff --git a/cluster/src/test/scala/org/apache/spark/memory/SnappyLocalIndexAccountingSuite.scala b/cluster/src/test/scala/org/apache/spark/memory/SnappyLocalIndexAccountingSuite.scala
index cf596604e9..7c3175c6bb 100644
--- a/cluster/src/test/scala/org/apache/spark/memory/SnappyLocalIndexAccountingSuite.scala
+++ b/cluster/src/test/scala/org/apache/spark/memory/SnappyLocalIndexAccountingSuite.scala
@@ -22,16 +22,14 @@ import java.sql.DriverManager
 import com.gemstone.gemfire.internal.cache.LocalRegion
 import com.pivotal.gemfirexd.TestUtil
 import io.snappydata.SnappyTableStatsProviderService
-import io.snappydata.test.dunit.DistributedTestBase.InitializeRun
 
 import org.apache.spark.SparkEnv
 import org.apache.spark.sql.types.{IntegerType, StructField, StructType}
 import org.apache.spark.sql.{Row, SnappyContext, SnappySession}
 
-
 class SnappyLocalIndexAccountingSuite extends MemoryFunSuite {
 
-  InitializeRun.setUp()
+  TestUtil.globalSetUp()
 
   val struct = (new StructType())
       .add(StructField("col1", IntegerType, true))
diff --git a/cluster/src/test/scala/org/apache/spark/memory/SnappyMemoryAccountingSuite.scala b/cluster/src/test/scala/org/apache/spark/memory/SnappyMemoryAccountingSuite.scala
index 25f1faa26d..20aaeb444f 100644
--- a/cluster/src/test/scala/org/apache/spark/memory/SnappyMemoryAccountingSuite.scala
+++ b/cluster/src/test/scala/org/apache/spark/memory/SnappyMemoryAccountingSuite.scala
@@ -25,10 +25,10 @@ import scala.actors.Futures._
 
 import com.gemstone.gemfire.cache.LowMemoryException
 import com.gemstone.gemfire.internal.cache.{GemFireCacheImpl, LocalRegion}
+import com.pivotal.gemfirexd.TestUtil
 import com.pivotal.gemfirexd.internal.engine.Misc
 import io.snappydata.cluster.ClusterManagerTestBase
 import io.snappydata.externalstore.Data
-import io.snappydata.test.dunit.DistributedTestBase.InitializeRun
 
 import org.apache.spark.sql.catalyst.expressions.{SpecificInternalRow, UnsafeProjection, UnsafeRow}
 import org.apache.spark.sql.types._
@@ -36,11 +36,9 @@ import org.apache.spark.sql.{CachedDataFrame, Row, SnappyContext, SnappySession}
 import org.apache.spark.unsafe.types.UTF8String
 import org.apache.spark.{SparkEnv, TaskContextImpl}
 
-
 class SnappyMemoryAccountingSuite extends MemoryFunSuite {
 
-  InitializeRun.setUp()
-
+  TestUtil.globalSetUp()
 
   val struct = (new StructType())
       .add(StructField("col1", IntegerType, true))
diff --git a/cluster/src/test/scala/org/apache/spark/memory/SnappyStorageEvictorSuite.scala b/cluster/src/test/scala/org/apache/spark/memory/SnappyStorageEvictorSuite.scala
index 5298ae59e9..32c5c8f99f 100644
--- a/cluster/src/test/scala/org/apache/spark/memory/SnappyStorageEvictorSuite.scala
+++ b/cluster/src/test/scala/org/apache/spark/memory/SnappyStorageEvictorSuite.scala
@@ -16,9 +16,8 @@
  */
 package org.apache.spark.memory
 
-
 import com.gemstone.gemfire.internal.cache.LocalRegion
-import io.snappydata.test.dunit.DistributedTestBase.InitializeRun
+import com.pivotal.gemfirexd.TestUtil
 
 import org.apache.spark.SparkEnv
 import org.apache.spark.sql.types.{IntegerType, StructField, StructType}
@@ -29,7 +28,7 @@ case class Data1(col1: Int, col2: Int, col3: Int)
 
 class SnappyStorageEvictorSuite extends MemoryFunSuite {
 
-  InitializeRun.setUp()
+  TestUtil.globalSetUp()
 
   private val struct = new StructType()
     .add(StructField("col1", IntegerType))
diff --git a/cluster/src/test/scala/org/apache/spark/sql/SQLFunctionsTestSuite.scala b/cluster/src/test/scala/org/apache/spark/sql/SQLFunctionsTestSuite.scala
index 8122a73faf..f48fcb3517 100644
--- a/cluster/src/test/scala/org/apache/spark/sql/SQLFunctionsTestSuite.scala
+++ b/cluster/src/test/scala/org/apache/spark/sql/SQLFunctionsTestSuite.scala
@@ -18,21 +18,18 @@ package org.apache.spark.sql
 
 import java.io.{File, FileOutputStream, PrintWriter}
 import java.math.BigDecimal
-import java.nio.file.{Files, Paths}
 import java.sql.{Date, Timestamp}
 import java.text.SimpleDateFormat
 import java.util.Calendar
 
-import scala.io.Source
 import scala.language.postfixOps
 
 import io.snappydata.SnappyFunSuite
+import org.junit.Assert._
 import org.scalatest.{BeforeAndAfter, BeforeAndAfterAll}
 
 import org.apache.spark.Logging
-import org.apache.spark.sql.NorthWindDUnitTest.writeToFile
 import org.apache.spark.sql.types._
-import org.junit.Assert._
 
 class SQLFunctionsTestSuite extends SnappyFunSuite
     with Logging
@@ -49,7 +46,7 @@ class SQLFunctionsTestSuite extends SnappyFunSuite
    * If your test needs CodegenFallback, then override the newConf function
    * & clear the flag from the conf of the test locally.
    */
-  val sparkSession = SparkSession.builder().
+  private val sparkSession = SparkSession.builder().
     config(io.snappydata.Property.TestDisableCodeGenFlag.name, "true").
     config(io.snappydata.Property.UseOptimizedHashAggregateForSingleKey.name, "true").
     config(io.snappydata.Property.TestCodeSplitThresholdInSHA.name, "5").
diff --git a/cluster/src/test/scala/org/apache/spark/sql/execution/benchmark/StringBenchmark.scala b/cluster/src/test/scala/org/apache/spark/sql/execution/benchmark/StringBenchmark.scala
index 253ab389a8..7d04567ee0 100644
--- a/cluster/src/test/scala/org/apache/spark/sql/execution/benchmark/StringBenchmark.scala
+++ b/cluster/src/test/scala/org/apache/spark/sql/execution/benchmark/StringBenchmark.scala
@@ -20,7 +20,7 @@ package org.apache.spark.sql.execution.benchmark
 import java.nio.charset.StandardCharsets
 import java.util.UUID
 
-import scala.io.Source
+import scala.io.{Codec, Source}
 
 import io.snappydata.SnappyFunSuite
 import it.unimi.dsi.fastutil.longs.LongArrayList
@@ -65,6 +65,15 @@ class StringBenchmark extends SnappyFunSuite {
     System.runFinalization()
   }
 
+  private def readLines(file: String): Iterator[String] = {
+    val source = Source.fromFile(file)(Codec.UTF8)
+    try {
+      source.getLines()
+    } finally {
+      source.close()
+    }
+  }
+
   private def runUTF8StringCompareTo(numElements: Int, numDistinct: Int,
       numIters: Int = 10, preSorted: Boolean = false): Unit = {
     val rnd = new XORShiftRandom
@@ -131,7 +140,7 @@ class StringBenchmark extends SnappyFunSuite {
     val numLoads = 1500
     val numIters = 20
 
-    val sdata = (1 to numLoads).flatMap(_ => Source.fromFile(customerFile).getLines()).toArray
+    val sdata = (1 to numLoads).flatMap(_ => readLines(customerFile)).toArray
     val numElements = sdata.length
     val data = sdata.map(UTF8String.fromString)
     val udata = sdata.map(toDirectUTF8String)
diff --git a/cluster/src/test/scala/org/apache/spark/sql/store/SQLMetadataTest.scala b/cluster/src/test/scala/org/apache/spark/sql/store/SQLMetadataTest.scala
index ccb4867605..907f3bb27b 100644
--- a/cluster/src/test/scala/org/apache/spark/sql/store/SQLMetadataTest.scala
+++ b/cluster/src/test/scala/org/apache/spark/sql/store/SQLMetadataTest.scala
@@ -47,7 +47,7 @@ class SQLMetadataTest extends SnappyFunSuite {
     try {
       val stmt = conn.createStatement()
       MetadataTest.testSYSTablesAndVTIs(SnappyFunSuite.resultSetToDataset(session, stmt),
-        netServers = Seq(s"localhost/127.0.0.1[$netPort]"))
+        netServers = Seq(s"127.0.0.1/127.0.0.1[$netPort]"))
       stmt.close()
     } finally {
       conn.close()
@@ -73,7 +73,7 @@ class SQLMetadataTest extends SnappyFunSuite {
     try {
       val stmt = conn.createStatement()
       MetadataTest.testDSIDWithSYSTables(SnappyFunSuite.resultSetToDataset(session, stmt),
-        Seq(s"localhost/127.0.0.1[$netPort]"))
+        Seq(s"127.0.0.1/127.0.0.1[$netPort]"))
       stmt.close()
     } finally {
       conn.close()
diff --git a/compatibilityTests/src/test/scala/org/apache/spark/sql/test/SnappySparkTestUtil.scala b/compatibilityTests/src/test/scala/org/apache/spark/sql/test/SnappySparkTestUtil.scala
index 23cdea8de3..69b7352082 100644
--- a/compatibilityTests/src/test/scala/org/apache/spark/sql/test/SnappySparkTestUtil.scala
+++ b/compatibilityTests/src/test/scala/org/apache/spark/sql/test/SnappySparkTestUtil.scala
@@ -16,25 +16,21 @@
  */
 package org.apache.spark.sql.test
 
-import java.io.File
-
+import com.pivotal.gemfirexd.internal.engine.GfxdConstants
 import io.snappydata.test.dunit.DistributedTestBase.InitializeRun
-import org.scalatest.{Tag}
+import org.scalatest.Tag
 
 import org.apache.spark.SparkFunSuite
 
 trait SnappySparkTestUtil extends SparkFunSuite {
 
   InitializeRun.setUp()
-
-  def withDir(dirName: String)(f: => Unit): Unit = {
-    new File(dirName).mkdir()
-  }
+  System.setProperty(GfxdConstants.SYS_PERSISTENT_DIR_PROP, System.getProperty("user.dir"))
 
   def excluded: Seq[String] = Nil
   def ignored: Seq[String] = Nil
 
-  override protected def test(testName: String, testTags: Tag*)(testFun: => Unit) = {
+  override protected def test(testName: String, testTags: Tag*)(testFun: => Unit): Unit = {
     if (!excluded.contains(testName)) {
       if (ignored.contains(testName)) {
         super.ignore(testName, testTags: _*)(testFun)
diff --git a/core/build.gradle b/core/build.gradle
index 7dad83b29f..645c0f9d29 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -26,8 +26,6 @@ sourceSets.test.scala.srcDirs = [ 'src/test/java', 'src/test/scala',
 sourceSets.main.java.srcDirs = []
 sourceSets.test.java.srcDirs = []
 
-def osName = org.gradle.internal.os.OperatingSystem.current()
-
 dependencies {
   compileOnly 'org.scala-lang:scala-library:' + scalaVersion
   compileOnly 'org.scala-lang:scala-reflect:' + scalaVersion
@@ -180,7 +178,7 @@ dependencies {
 }
 
 task packageScalaDocs(type: Jar, dependsOn: scaladoc) {
-  classifier = 'javadoc'
+  archiveClassifier.set('javadoc')
   from scaladoc
 }
 if (rootProject.hasProperty('enablePublish')) {
@@ -240,13 +238,15 @@ def taskGetApacheSparkDist(String ver, String distName, String prodDir) {
 }
 
 task getApacheSparkDist {
-  dependsOn taskGetApacheSparkDist(sparkVersion, "spark-${sparkVersion}-bin-hadoop2.7", sparkProductDir)
-  dependsOn taskGetApacheSparkDist(sparkCurrentVersion, "spark-${sparkCurrentVersion}-bin-hadoop2.7", sparkCurrentProductDir)
+  dependsOn taskGetApacheSparkDist(sparkVersion, sparkDistName, sparkProductDir)
+  dependsOn taskGetApacheSparkDist(sparkCurrentVersion, sparkCurrentDistName, sparkCurrentProductDir)
 }
 
 test.dependsOn ':cleanJUnit'
 dunitTest.dependsOn getApacheSparkDist
 dunitSecurityTest.dependsOn getApacheSparkDist
+// SnappyJobTestSupport.getJobJar needs cluster tests
+dunitTest.dependsOn ":snappy-cluster_${scalaBinaryVersion}:testClasses"
 // SplitClusterDUnitSecurityTest.testSnappyStreamingJob needs cluster tests
 dunitSecurityTest.dependsOn ":snappy-cluster_${scalaBinaryVersion}:testClasses"
 check.dependsOn test, scalaTest, dunitTest, dunitSecurityTest
@@ -304,13 +304,13 @@ task sparkPackagePom(dependsOn: shadowJar) { doLast {
   copy {
     from "${buildDir}/libs"
     into "${rootProject.buildDir}/distributions"
-    include "${shadowJar.archiveName}"
+    include "${shadowJar.archiveFileName.get()}"
     rename { filename -> "${sparkPackageName}.jar" }
   }
 } }
 task sparkPackage(type: Zip, dependsOn: sparkPackagePom) {
   archiveName "${sparkPackageName}.zip"
-  destinationDir = file("${rootProject.buildDir}/distributions")
+  destinationDirectory.set(file("${rootProject.buildDir}/distributions"))
   outputs.upToDateWhen { false }
 
   from ("${rootProject.buildDir}/distributions") {
diff --git a/core/src/dunit/scala/io/snappydata/cluster/CassandraSnappyDUnitTest.scala b/core/src/dunit/scala/io/snappydata/cluster/CassandraSnappyDUnitTest.scala
index 4ad99a9ea8..f659396364 100644
--- a/core/src/dunit/scala/io/snappydata/cluster/CassandraSnappyDUnitTest.scala
+++ b/core/src/dunit/scala/io/snappydata/cluster/CassandraSnappyDUnitTest.scala
@@ -17,9 +17,8 @@
 package io.snappydata.cluster
 
 import java.io._
-import java.nio.file.{Files, Paths}
+import java.nio.file.{Files, Paths, StandardCopyOption}
 import java.sql.{Connection, DriverManager, ResultSet, SQLException, Statement}
-import java.util
 
 import scala.language.postfixOps
 import scala.sys.process._
@@ -27,21 +26,25 @@ import scala.sys.process._
 import io.snappydata.Constant
 import io.snappydata.test.dunit.{AvailablePortHelper, DistributedTestBase}
 import org.apache.commons.io.FileUtils
-import org.apache.commons.io.filefilter.{IOFileFilter, TrueFileFilter, WildcardFileFilter}
 
 import org.apache.spark.Logging
 
 class CassandraSnappyDUnitTest(val s: String)
-    extends DistributedTestBase(s) with SnappyJobTestSupport with Logging {
-  // scalastyle:off println
+    extends DistributedTestBase(s) with ClusterUtils with SnappyJobTestSupport with Logging {
 
   def getConnection(netPort: Int): Connection =
     DriverManager.getConnection(s"${Constant.DEFAULT_THIN_CLIENT_URL}localhost:$netPort")
 
-  override val snappyProductDir = System.getenv("SNAPPY_HOME")
+  val scriptPath = s"$snappyHomeDir/../../../cluster/src/test/resources/scripts"
+  val downloadPath = s"$snappyHomeDir/../../../dist"
 
-  val scriptPath = s"$snappyProductDir/../../../cluster/src/test/resources/scripts"
-  val downloadPath = s"$snappyProductDir/../../../dist"
+  private[this] val cassandraVersion = "2.1.22"
+  private[this] val cassandraConnVersion = System.getenv("SPARK_CONNECTOR_VERSION") match {
+    case null => "2.0.13"
+    case v if v.startsWith("2.4") => "2.4.3"
+    case v if v.startsWith("2.3") => "2.3.3"
+    case _ => "2.0.13"
+  }
 
   lazy val downloadLoc = {
     val path = if (System.getenv().containsKey("GRADLE_USER_HOME")) {
@@ -70,8 +73,11 @@ class CassandraSnappyDUnitTest(val s: String)
   def snappyShell: String = s"$snappyProductDir/bin/snappy-sql"
 
   override def beforeClass(): Unit = {
-
     super.beforeClass()
+
+    // stop any previous cluster and cleanup data
+    stopSnappyCluster()
+
     logInfo(s"Starting snappy cluster in $snappyProductDir/work with locator client port $netPort")
 
     val confDir = s"$snappyProductDir/conf"
@@ -82,10 +88,9 @@ class CassandraSnappyDUnitTest(val s: String)
       s"$confDir/leads")
     sobj.writeToFile(s"""localhost  -locators=localhost[$port] -client-port=$netPort2
          |""".stripMargin, s"$confDir/servers")
-    logInfo(s"Starting snappy cluster in $snappyProductDir/work")
+    startSnappyCluster()
 
-    logInfo((snappyProductDir + "/sbin/snappy-start-all.sh").!!)
-    Thread.sleep(10000)
+    // Thread.sleep(10000)
     logInfo("Download Location : " + downloadLoc)
 
     logInfo(s"Creating $downloadPath")
@@ -93,29 +98,29 @@ class CassandraSnappyDUnitTest(val s: String)
     new File(snappyProductDir, "books.xml").createNewFile()
     sparkXmlJarPath = downloadURI("https://repo1.maven.org/maven2/com/databricks/" +
         "spark-xml_2.11/0.4.1/spark-xml_2.11-0.4.1.jar")
-    val cassandraJarLoc = getLoc(downloadLoc)
-    cassandraConnectorJarLoc =
-      getUserAppJarLocation("spark-cassandra-connector_2.11-2.0.7.jar", downloadLoc)
-    if (cassandraJarLoc.nonEmpty && cassandraConnectorJarLoc != null) {
-      cassandraClusterLoc = cassandraJarLoc.head
-    } else {
-      ("curl -OL http://www-us.apache.org/dist/cassandra/" +
-          s"2.1.21/apache-cassandra-2.1.21-bin.tar.gz").!!
-      ("curl -OL https://repo1.maven.org/maven2/com/datastax/spark/" +
-          "spark-cassandra-connector_2.11/2.0.7/" +
-          "spark-cassandra-connector_2.11-2.0.7.jar").!!
-      val jarLoc = getUserAppJarLocation("apache-cassandra-2.1.21-bin.tar.gz", currDir)
-      val connectorJarLoc =
-        getUserAppJarLocation("spark-cassandra-connector_2.11-2.0.7.jar", currDir)
-      ("tar xvf " + jarLoc).!!
-      val loc = getLoc(currDir).head
-      if (downloadLoc.nonEmpty) {
-        s"rm -rf $downloadLoc/*"
+    val cassandraClusterDir = s"apache-cassandra-$cassandraVersion"
+    val cassandraConnectorJar = s"spark-cassandra-connector_2.11-$cassandraConnVersion.jar"
+    cassandraClusterLoc = s"$downloadLoc/$cassandraClusterDir"
+    cassandraConnectorJarLoc = s"$downloadLoc/$cassandraConnectorJar"
+    var downloadFiles = true
+    if (Files.exists(Paths.get(cassandraClusterLoc))) {
+      if (Files.exists(Paths.get(cassandraConnectorJarLoc))) {
+        downloadFiles = false
+      } else {
+        FileUtils.deleteQuietly(new File(cassandraClusterLoc))
       }
-      s"cp -r $loc $downloadLoc".!!
-      s"mv $connectorJarLoc $downloadLoc".!!
-      cassandraClusterLoc = s"$downloadLoc/apache-cassandra-2.1.21"
-      cassandraConnectorJarLoc = s"$downloadLoc/spark-cassandra-connector_2.11-2.0.7.jar"
+    }
+    if (downloadFiles) {
+      val cassandraTarball = s"apache-cassandra-$cassandraVersion-bin.tar.gz"
+      s"curl -OL http://www-us.apache.org/dist/cassandra/$cassandraVersion/$cassandraTarball".!!
+      ("curl -OL https://repo1.maven.org/maven2/com/datastax/spark/" +
+          s"spark-cassandra-connector_2.11/$cassandraConnVersion/$cassandraConnectorJar").!!
+      ("tar xf " + cassandraTarball).!!
+      Files.createDirectories(Paths.get(downloadLoc))
+      val locDir = Paths.get(cassandraClusterDir)
+      ClusterUtils.copyDirectory(locDir, locDir, Paths.get(cassandraClusterLoc))
+      Files.move(Paths.get(cassandraConnectorJar), Paths.get(cassandraConnectorJarLoc),
+        StandardCopyOption.REPLACE_EXISTING)
     }
     logInfo("CassandraClusterLocation : " + cassandraClusterLoc +
         " CassandraConnectorJarLoc : " + cassandraConnectorJarLoc)
@@ -126,13 +131,7 @@ class CassandraSnappyDUnitTest(val s: String)
   override def afterClass(): Unit = {
     super.afterClass()
 
-    logInfo(s"Stopping snappy cluster in $snappyProductDir/work")
-    logInfo((snappyProductDir + "/sbin/snappy-stop-all.sh").!!)
-
-    s"rm -rf $snappyProductDir/work".!!
-    Files.deleteIfExists(Paths.get(snappyProductDir, "conf", "locators"))
-    Files.deleteIfExists(Paths.get(snappyProductDir, "conf", "leads"))
-    Files.deleteIfExists(Paths.get(snappyProductDir, "conf", "servers"))
+    stopSnappyCluster()
 
     logInfo("Stopping cassandra cluster")
     val p = Runtime.getRuntime.exec("pkill -f cassandra")
@@ -141,13 +140,6 @@ class CassandraSnappyDUnitTest(val s: String)
     logInfo("Cassandra cluster stopped successfully")
   }
 
-  def getLoc(path: String): List[String] = {
-    val cmd = Seq("find", path, "-name", "apache-cassandra-2.1.21", "-type", "d")
-    val res = cmd.lineStream_!.toList
-    logInfo("Cassandra folder location : " + res)
-    res
-  }
-
   private def downloadURI(url: String): String = {
     val jarName = url.split("/").last
     val jar = new File(downloadPath, jarName)
@@ -164,32 +156,6 @@ class CassandraSnappyDUnitTest(val s: String)
     jar.getAbsolutePath
   }
 
-  protected def getUserAppJarLocation(jarName: String, jarPath: String) = {
-    var userAppJarPath: String = null
-    if (new File(jarName).exists) jarName
-    else {
-      val baseDir: File = new File(jarPath)
-      try {
-        val filter: IOFileFilter = new WildcardFileFilter(jarName)
-        val files: util.List[File] = FileUtils.listFiles(baseDir, filter,
-          TrueFileFilter.INSTANCE).asInstanceOf[util.List[File]]
-        logInfo("Jar file found: " + util.Arrays.asList(files))
-        import scala.collection.JavaConverters._
-        for (file1: File <- files.asScala) {
-          if (!file1.getAbsolutePath.contains("/work/") ||
-              !file1.getAbsolutePath.contains("/scala-2.11/")) {
-            userAppJarPath = file1.getAbsolutePath
-          }
-        }
-      }
-      catch {
-        case _: Exception =>
-          logInfo("Unable to find " + jarName + " jar at " + jarPath + " location.")
-      }
-      userAppJarPath
-    }
-  }
-
   implicit class X(in: Seq[String]) {
     def pipe(cmd: String): Stream[String] =
       cmd #< new ByteArrayInputStream(in.mkString("\n").getBytes) lineStream
@@ -200,7 +166,9 @@ class CassandraSnappyDUnitTest(val s: String)
       new FileOutputStream(commandOutput, true))))
     try {
       sqlCommand pipe snappyShell foreach (s => {
+        // scalastyle:off println
         writer.println(s)
+        // scalastyle:on println
         if (s.toString.contains("ERROR") || s.toString.contains("Failed")) {
           throw new Exception(s"Failed to run Query: $s")
         }
@@ -249,7 +217,8 @@ class CassandraSnappyDUnitTest(val s: String)
     logInfo("Running testDeployPackageWithExternalTableInSnappyShell")
     SnappyShell("CreateExternalTable",
       Seq(s"connect client 'localhost:$netPort';",
-        "deploy package cassandraJar 'com.datastax.spark:spark-cassandra-connector_2.11:2.0.7';",
+        "deploy package cassandraJar " +
+            s"'com.datastax.spark:spark-cassandra-connector_2.11:$cassandraConnVersion';",
         "drop table if exists customer2;",
         "create external table customer2 using org.apache.spark.sql.cassandra" +
             " options (table 'customer', keyspace 'test'," +
@@ -263,7 +232,7 @@ class CassandraSnappyDUnitTest(val s: String)
   def doTestDeployPackageWithExternalTable(): Unit = {
     logInfo("Running testDeployPackageWithExternalTable")
     stmt1.execute("deploy package cassandraJar " +
-        "'com.datastax.spark:spark-cassandra-connector_2.11:2.0.7'")
+        s"'com.datastax.spark:spark-cassandra-connector_2.11:$cassandraConnVersion'")
     stmt1.execute("drop table if exists customer2")
     stmt1.execute("create external table customer2 using org.apache.spark.sql.cassandra options" +
         " (table 'customer', keyspace 'test', spark.cassandra.input.fetch.size_in_rows '200000'," +
@@ -293,19 +262,19 @@ class CassandraSnappyDUnitTest(val s: String)
       case t: Throwable => assert(assertion = false, s"Unexpected exception $t")
     }
     stmt1.execute("deploy package cassandraJar " +
-        "'com.datastax.spark:spark-cassandra-connector_2.11:2.0.7'")
+        s"'com.datastax.spark:spark-cassandra-connector_2.11:$cassandraConnVersion'")
     stmt1.execute("deploy package GoogleGSONAndAvro " +
         "'com.google.code.gson:gson:2.8.5,com.databricks:spark-avro_2.11:4.0.0' " +
         s"path '$snappyProductDir/testdeploypackagepath'")
     stmt1.execute("deploy package MSSQL 'com.microsoft.sqlserver:sqljdbc4:4.0'" +
-        " repos 'http://clojars.org/repo/'")
+        " repos 'https://clojars.org/repo/'")
     stmt1.execute("list packages")
     assert(getCount(stmt1.getResultSet) == 3)
 
     logInfo("Restarting the cluster for " +
         "CassandraSnappyDUnitTest.doTestDeployPackageWithExternalTable()")
-    logInfo((snappyProductDir + "/sbin/snappy-stop-all.sh").!!)
-    logInfo((snappyProductDir + "/sbin/snappy-start-all.sh").!!)
+    stopSnappyCluster(deleteData = false)
+    startSnappyCluster()
 
     user1Conn = getConnection(netPort)
     stmt1 = user1Conn.createStatement()
@@ -347,8 +316,8 @@ class CassandraSnappyDUnitTest(val s: String)
 
     logInfo("Restarting the cluster for " +
         "CassandraSnappyDUnitTest.doTestDeployJarWithExternalTable()")
-    logInfo((snappyProductDir + "/sbin/snappy-stop-all.sh").!!)
-    logInfo((snappyProductDir + "/sbin/snappy-start-all.sh").!!)
+    stopSnappyCluster(deleteData = false)
+    startSnappyCluster()
 
     user1Conn = getConnection(netPort)
     stmt1 = user1Conn.createStatement()
@@ -414,7 +383,7 @@ class CassandraSnappyDUnitTest(val s: String)
   def doTestDeployPackageWithSnappyJob(): Unit = {
     logInfo("Running testDeployPackageWithSnappyJob")
     stmt1.execute("deploy package cassandraJar " +
-        "'com.datastax.spark:spark-cassandra-connector_2.11:2.0.7'")
+        s"'com.datastax.spark:spark-cassandra-connector_2.11:$cassandraConnVersion'")
     stmt1.execute("drop table if exists customer")
     submitAndWaitForCompletion("io.snappydata.cluster.jobs.CassandraSnappyConnectionJob" ,
       "--conf spark.cassandra.connection.host=localhost")
@@ -443,10 +412,10 @@ class CassandraSnappyDUnitTest(val s: String)
     stmt1.execute("list packages")
     assert(getCount(stmt1.getResultSet) == 0)
     stmt1.execute(s"deploy package MSSQL 'com.microsoft.sqlserver:sqljdbc4:4.0'" +
-        s" repos 'http://clojars.org/repo/' path '$snappyProductDir/mssqlJar1'")
+        s" repos 'https://clojars.org/repo/' path '$snappyProductDir/mssqlJar1'")
     try {
       stmt1.execute("deploy package MSSQL1 'com.microsoft.sqlserver:sqljdbc4:4.0'" +
-          s" repos 'http://clojars.org/repo/' path '$snappyProductDir/mssqlJar';")
+          s" repos 'https://clojars.org/repo/' path '$snappyProductDir/mssqlJar';")
       assert(assertion = false, s"Expected an exception!")
     } catch {
       case sqle: SQLException if sqle.getSQLState == "38000" => // expected
@@ -464,7 +433,7 @@ class CassandraSnappyDUnitTest(val s: String)
     assert(getCount(stmt1.getResultSet) == 0)
 
     stmt1.execute("deploy package MSSQL1 'com.microsoft.sqlserver:sqljdbc4:4.0'" +
-        s" repos 'http://clojars.org/repo/' path '$snappyProductDir/mssqlJar';")
+        s" repos 'https://clojars.org/repo/' path '$snappyProductDir/mssqlJar';")
 
     stmt1.execute("list packages")
     assert(getCount(stmt1.getResultSet) == 1)
diff --git a/core/src/dunit/scala/io/snappydata/cluster/ClusterUtils.scala b/core/src/dunit/scala/io/snappydata/cluster/ClusterUtils.scala
new file mode 100644
index 0000000000..7d46cfc74b
--- /dev/null
+++ b/core/src/dunit/scala/io/snappydata/cluster/ClusterUtils.scala
@@ -0,0 +1,240 @@
+/*
+ * Copyright (c) 2017-2021 TIBCO Software Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you
+ * may not use this file except in compliance with the License. You
+ * may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * permissions and limitations under the License. See accompanying
+ * LICENSE file.
+ */
+
+package io.snappydata.cluster
+
+import java.io.{BufferedWriter, FileWriter, PrintWriter}
+import java.nio.file.{Files, Path, Paths, StandardCopyOption}
+import java.util.concurrent.atomic.AtomicBoolean
+
+import scala.collection.JavaConverters._
+import scala.io.{Codec, Source}
+import scala.sys.process._
+import scala.util.control.NonFatal
+
+import io.snappydata.test.dunit.VM
+import io.snappydata.test.util.TestException
+import org.apache.commons.io.FileUtils
+
+import org.apache.spark.Logging
+import org.apache.spark.sql.SnappyContext
+
+trait ClusterUtils extends Logging {
+
+  val snappyHomeDir: String = System.getProperty("SNAPPY_HOME")
+
+  lazy val snappyProductDir: String = {
+    if (snappyHomeDir ne null) createClusterDirectory(snappyHomeDir, isSnappy = true)
+    else "<undefined>"
+  }
+
+  protected def sparkProductDir: String = snappyHomeDir
+
+  def createClusterDirectory(productDir: String, isSnappy: Boolean): String = {
+    val source = Paths.get(productDir).toAbsolutePath
+    val clusterDir = ClusterUtils.getClusterDirectory(source, isSnappy)
+    val dest = Paths.get(clusterDir).toAbsolutePath
+    if (!Files.exists(dest)) {
+      // link most of product directory contents and copy the conf and scripts
+      Files.createDirectories(dest)
+      val contents = Files.list(source)
+      try {
+        for (item <- contents.iterator().asScala) {
+          val fileName = item.getFileName
+          val fileNameStr = fileName.toString
+          if (ClusterUtils.copyDirs.contains(fileNameStr)) {
+            ClusterUtils.copyDirectory(source, item, dest)
+          } else if (!ClusterUtils.skipDirs.contains(fileNameStr)) {
+            Files.createSymbolicLink(dest.resolve(fileName), item)
+          }
+        }
+      } finally contents.close()
+      ClusterUtils.deleteClusterRuntimeData(clusterDir)
+    }
+    clusterDir
+  }
+
+  def writeToFile(str: String, filePath: String, append: Boolean = false): Unit =
+    ClusterUtils.writeToFile(str, filePath, append)
+
+  def startSparkCluster(vm: Option[VM] = None, productDir: String = sparkProductDir): String = {
+    val clusterDir = createClusterDirectory(productDir, isSnappy = false)
+    vm match {
+      case None => ClusterUtils.startSparkCluster(clusterDir)
+      case Some(v) =>
+        v.invoke(ClusterUtils, "startSparkCluster", Array(clusterDir: AnyRef)).toString
+    }
+  }
+
+  def stopSparkCluster(vm: Option[VM] = None, productDir: String = sparkProductDir): Unit = {
+    val clusterDir = ClusterUtils.getSparkClusterDirectory(productDir)
+    vm match {
+      case None => ClusterUtils.stopSparkCluster(clusterDir)
+      case Some(v) => v.invoke(ClusterUtils, "stopSparkCluster", Array(clusterDir: AnyRef))
+    }
+  }
+
+  def startSnappyCluster(vm: Option[VM] = None, enableHiveServer: Boolean = false,
+      startArgs: String = ""): String = vm match {
+    case None => ClusterUtils.startSnappyCluster(snappyProductDir, enableHiveServer, startArgs)
+    case Some(v) =>
+      v.invoke(ClusterUtils, "startSnappyCluster",
+        Array(snappyProductDir, enableHiveServer.asInstanceOf[AnyRef], startArgs)).toString
+  }
+
+  def stopSnappyCluster(vm: Option[VM] = None, stopArgs: String = "",
+      deleteData: Boolean = true): Unit = vm match {
+    case None => ClusterUtils.stopSnappyCluster(snappyProductDir, stopArgs, deleteData)
+    case Some(v) =>
+      v.invoke(ClusterUtils, "stopSnappyCluster",
+        Array(snappyProductDir, stopArgs, deleteData.asInstanceOf[AnyRef]))
+  }
+}
+
+object ClusterUtils extends Serializable with Logging {
+
+  private val snappyProductDir = getClusterDirectory("snappy")
+  private val copyDirs = Set("bin", "conf", "python", "sbin")
+  private val skipDirs = Set("logs", "work")
+
+  private[this] val snappyStartFailed = new AtomicBoolean(false)
+
+  private[this] def getClusterDirectory(suffix: String): String =
+    s"${System.getProperty("user.dir")}/$suffix"
+
+  private def getClusterDirectory(productPath: => Path, isSnappy: Boolean): String = {
+    if (isSnappy) snappyProductDir else getClusterDirectory(productPath.getFileName.toString)
+  }
+
+  private def deleteClusterRuntimeData(clusterDir: String): Unit = {
+    for (dir <- skipDirs) {
+      FileUtils.deleteQuietly(new java.io.File(s"$clusterDir/$dir"))
+    }
+    Files.deleteIfExists(Paths.get(clusterDir, "conf", "locators"))
+    Files.deleteIfExists(Paths.get(clusterDir, "conf", "servers"))
+    Files.deleteIfExists(Paths.get(clusterDir, "conf", "leads"))
+    Files.deleteIfExists(Paths.get(clusterDir, "conf", "snappy-env.sh"))
+    Files.deleteIfExists(Paths.get(clusterDir, "conf", "spark-env.sh"))
+    Files.deleteIfExists(Paths.get(clusterDir, "conf", "log4j.properties"))
+  }
+
+  def getEnvironmentVariable(name: String): String = {
+    val value = System.getenv(name)
+    if (name eq null) {
+      throw new TestException(s"Environment variable $name is not defined")
+    }
+    value
+  }
+
+  def getSparkClusterDirectory(productDir: String): String =
+    getClusterDirectory(Paths.get(productDir), isSnappy = false)
+
+  def writeToFile(str: String, filePath: String, append: Boolean): Unit = {
+    val fileWriter = new FileWriter(filePath, append)
+    val bufferedWriter = new BufferedWriter(fileWriter)
+    val pw = new PrintWriter(bufferedWriter)
+    try {
+      pw.write(str)
+      pw.flush()
+    } finally {
+      pw.close()
+    }
+    // wait until file becomes available (e.g. running on NFS)
+    var matched = append
+    while (!matched) {
+      Thread.sleep(100)
+      try {
+        val source = Source.fromFile(filePath)(Codec.UTF8)
+        val lines = try {
+          source.mkString
+        } finally {
+          source.close()
+        }
+        matched = lines == str
+      } catch {
+        case NonFatal(_) =>
+      }
+    }
+  }
+
+  def startSparkCluster(clusterDir: String): String = {
+    logInfo(s"Starting spark cluster in $clusterDir/work")
+    val output = s"$clusterDir/sbin/start-all.sh".!!
+    logInfo(output)
+    output
+  }
+
+  def stopSparkCluster(clusterDir: String): Unit = {
+    stopSpark()
+    logInfo(s"Stopping spark cluster in $clusterDir/work")
+    logInfo(s"$clusterDir/sbin/stop-all.sh".!!)
+  }
+
+  def startSnappyCluster(clusterDir: String, enableHiveServer: Boolean,
+      startArgs: String): String = {
+    logInfo(s"Starting SnappyData cluster in $clusterDir/work " +
+        s"[enableHiveServer=$enableHiveServer startArgs=$startArgs]")
+    if (!enableHiveServer) {
+      writeToFile(
+        "\nLEAD_STARTUP_OPTIONS=\"$LEAD_STARTUP_OPTIONS -snappydata.hiveServer.enabled=false\"",
+        s"$clusterDir/conf/snappy-env.sh", append = true)
+    }
+    val output =
+      if (startArgs.isEmpty) s"$clusterDir/sbin/snappy-start-all.sh".!!
+      else s"$clusterDir/sbin/snappy-start-all.sh $startArgs".!!
+    logInfo(output)
+    snappyStartFailed.set(output.contains("stopped") || output.contains("Exception"))
+    output
+  }
+
+  def stopSnappyCluster(clusterDir: String, stopArgs: String, deleteData: Boolean): Unit = {
+    stopSpark()
+    logInfo(s"Stopping SnappyData cluster in $clusterDir/work [stopArgs=$stopArgs]")
+    if (stopArgs.isEmpty) logInfo(s"$clusterDir/sbin/snappy-stop-all.sh".!!)
+    else logInfo(s"$clusterDir/sbin/snappy-stop-all.sh $stopArgs".!!)
+    if (deleteData) {
+      // preserve the output if startup had failed
+      if (snappyStartFailed.compareAndSet(true, false)) {
+        val workDir = Paths.get(clusterDir, "work")
+        if (Files.exists(workDir)) {
+          Files.move(workDir, Paths.get(clusterDir, "work-" + System.currentTimeMillis()))
+        }
+      }
+      deleteClusterRuntimeData(clusterDir)
+    }
+    snappyStartFailed.compareAndSet(true, false)
+  }
+
+  def stopSpark(): Unit = {
+    logInfo("Stopping spark")
+    val sc = SnappyContext.globalSparkContext
+    if (sc ne null) sc.stop()
+  }
+
+  /**
+   * Copy a given item within source (can be same as source) to destination preserving attributes.
+   */
+  def copyDirectory(source: Path, item: Path, dest: Path): Unit = {
+    val tree = Files.walk(item)
+    try {
+      for (p <- tree.iterator().asScala) {
+        Files.copy(p, dest.resolve(source.relativize(p)), StandardCopyOption.COPY_ATTRIBUTES,
+          StandardCopyOption.REPLACE_EXISTING)
+      }
+    } finally tree.close()
+  }
+}
diff --git a/core/src/dunit/scala/io/snappydata/cluster/SnappyJobTestSupport.scala b/core/src/dunit/scala/io/snappydata/cluster/SnappyJobTestSupport.scala
index 736306261f..4f39cde81a 100644
--- a/core/src/dunit/scala/io/snappydata/cluster/SnappyJobTestSupport.scala
+++ b/core/src/dunit/scala/io/snappydata/cluster/SnappyJobTestSupport.scala
@@ -16,21 +16,23 @@
  */
 package io.snappydata.cluster
 
-import java.io.{File, FileFilter}
+import java.io.File
+
+import scala.sys.process._
 
 import io.snappydata.test.dunit.DistributedTestBase
 import io.snappydata.test.dunit.DistributedTestBase.WaitCriterion
+import org.apache.commons.lang.StringUtils
 
 import org.apache.spark.{Logging, TestPackageUtils}
-import scala.sys.process._
-
-import org.apache.commons.lang.StringUtils
 
 /**
  * A helper trait containing functions for managing snappy jobs.
  */
 trait SnappyJobTestSupport extends Logging {
 
+  val snappyHomeDir: String
+
   val snappyProductDir: String
 
   /**
@@ -100,7 +102,7 @@ trait SnappyJobTestSupport extends Logging {
   }
 
   private def getJobJar(className: String, packageStr: String = ""): String = {
-    val dir = new File(s"$snappyProductDir/../../../cluster/build-artifacts/scala-2.11/classes/"
+    val dir = new File(s"$snappyHomeDir/../../../cluster/build-artifacts/scala-2.11/classes/"
         + s"scala/test/$packageStr")
 
     assert(dir.exists() && dir.isDirectory, s"snappy-cluster scala tests not compiled. Directory " +
diff --git a/core/src/dunit/scala/io/snappydata/cluster/SplitClusterDUnitSecurityTest.scala b/core/src/dunit/scala/io/snappydata/cluster/SplitClusterDUnitSecurityTest.scala
index da7decc9bd..c73973973c 100644
--- a/core/src/dunit/scala/io/snappydata/cluster/SplitClusterDUnitSecurityTest.scala
+++ b/core/src/dunit/scala/io/snappydata/cluster/SplitClusterDUnitSecurityTest.scala
@@ -21,7 +21,6 @@ import java.nio.file.{Files, Paths}
 import java.sql.{Connection, SQLException, Statement}
 import java.util.Properties
 
-import scala.collection.mutable
 import scala.language.{implicitConversions, postfixOps}
 import scala.sys.process._
 
@@ -33,11 +32,10 @@ import io.snappydata.Constant
 import io.snappydata.test.dunit.DistributedTestBase.WaitCriterion
 import io.snappydata.test.dunit._
 import io.snappydata.util.TestUtils
-import org.apache.commons.io.FileUtils
 
-import org.apache.spark.{SparkContext, SparkUtilsAccess}
-import org.apache.spark.sql.types.{IntegerType, StructField}
+import org.apache.spark.SparkUtilsAccess
 import org.apache.spark.sql._
+import org.apache.spark.sql.types.{IntegerType, StructField}
 
 class SplitClusterDUnitSecurityTest(s: String)
     extends DistributedTestBase(s)
@@ -122,15 +120,11 @@ class SplitClusterDUnitSecurityTest(s: String)
   def startArgs: Array[AnyRef] = Array(
     SplitClusterDUnitSecurityTest.locatorPort, bootProps).asInstanceOf[Array[AnyRef]]
 
-  override val snappyProductDir = testObject.getEnvironmentVariable("SNAPPY_HOME")
-
   override val jobConfigFile = s"$snappyProductDir/conf/job.config"
 
-  override protected val sparkProductDir: String =
-    testObject.getEnvironmentVariable("APACHE_SPARK_HOME").replaceAll("hadoop3.2", "hadoop2.7")
+  override protected val sparkProductDir: String = System.getProperty("APACHE_SPARK_HOME")
 
-  protected val currentProductDir: String =
-    testObject.getEnvironmentVariable("APACHE_SPARK_CURRENT_HOME").replaceAll("hadoop3.2", "hadoop2.7")
+  protected val currentProductDir: String = System.getProperty("APACHE_SPARK_CURRENT_HOME")
 
   override def locatorClientPort: Int = { SplitClusterDUnitSecurityTest.locatorNetPort }
 
@@ -141,10 +135,12 @@ class SplitClusterDUnitSecurityTest(s: String)
   override def beforeClass(): Unit = {
     super.beforeClass()
 
+    // stop any previous cluster and cleanup data
+    stopSnappyCluster()
+
     setSecurityProps()
     SplitClusterDUnitSecurityTest.bootExistingAuthModule(ldapProperties)
 
-    logInfo(s"Starting snappy cluster in $snappyProductDir/work")
     // create locators, leads and servers files
     val port = SplitClusterDUnitSecurityTest.locatorPort
     val netPort = SplitClusterDUnitSecurityTest.locatorNetPort
@@ -164,9 +160,9 @@ class SplitClusterDUnitSecurityTest(s: String)
       s"""localhost  -locators=localhost[$port] -client-port=$netPort1 $compressionArg $ldapConf
           |localhost  -locators=localhost[$port] -client-port=$netPort2 $compressionArg $ldapConf
           |""".stripMargin, s"$confDir/servers")
-    logInfo((snappyProductDir + "/sbin/snappy-start-all.sh").!!)
+    startSnappyCluster()
 
-    SplitClusterDUnitSecurityTest.startSparkCluster(sparkProductDir)
+    startSparkCluster()
   }
 
   def getLdapConf: String = {
@@ -182,19 +178,9 @@ class SplitClusterDUnitSecurityTest(s: String)
 
   override def afterClass(): Unit = {
     super.afterClass()
-    SplitClusterDUnitSecurityTest.stopSparkCluster(sparkProductDir)
-
-    logInfo(s"Stopping snappy cluster in $snappyProductDir/work")
-    logInfo((snappyProductDir + "/sbin/snappy-stop-all.sh").!!)
-
+    stopSparkCluster()
+    stopSnappyCluster()
     stopLdapTestServer()
-
-    Files.deleteIfExists(Paths.get(snappyProductDir, "conf", "locators"))
-    Files.deleteIfExists(Paths.get(snappyProductDir, "conf", "leads"))
-    Files.deleteIfExists(Paths.get(snappyProductDir, "conf", "servers"))
-    Files.deleteIfExists(Paths.get(snappyProductDir, "conf", "job.config"))
-    FileUtils.moveDirectory(new File(s"$snappyProductDir/work"), new File
-    (s"$snappyProductDir/work-snap-1957"))
   }
 
   def stopLdapTestServer(): Unit = {
@@ -221,7 +207,7 @@ class SplitClusterDUnitSecurityTest(s: String)
     val props = new Properties()
     props.setProperty(Attribute.USERNAME_ATTR, jdbcUser1)
     props.setProperty(Attribute.PASSWORD_ATTR, jdbcUser1)
-    SplitClusterDUnitTest.invokeSparkShell(snappyProductDir, sparkProductDir,
+    SplitClusterDUnitTest.runSparkShellTest(snappyProductDir, sparkProductDir,
       locatorClientPort, props)
   }
 
@@ -230,8 +216,17 @@ class SplitClusterDUnitSecurityTest(s: String)
     val props = new Properties()
     props.setProperty(Attribute.USERNAME_ATTR, jdbcUser1)
     props.setProperty(Attribute.PASSWORD_ATTR, jdbcUser1)
-    SplitClusterDUnitTest.invokeSparkShellCurrent(snappyProductDir, sparkProductDir,
-      currentProductDir, locatorClientPort, props, vm = null /* SparkContext in current VM */)
+
+    // stop the previous spark cluster else the new one will fail to start due to port conflicts
+    stopSparkCluster()
+    startSparkCluster(productDir = currentProductDir)
+    try {
+      SplitClusterDUnitTest.runSparkShellCurrentTest(snappyProductDir, currentProductDir,
+        locatorClientPort, props, vm = null /* SparkContext in current VM */)
+    } finally {
+      stopSparkCluster(productDir = currentProductDir)
+      startSparkCluster()
+    }
   }
 
   def testPreparedStatements(): Unit = {
@@ -670,13 +665,12 @@ class SplitClusterDUnitSecurityTest(s: String)
     adminConn.close()
     adminConn = null
     snc.sparkContext.stop()
-    logInfo(s"Stopping snappy cluster in $snappyProductDir/work")
-    logInfo((snappyProductDir + "/sbin/snappy-stop-all.sh").!!)
+    stopSnappyCluster(deleteData = false)
     var waitSeconds = 30
     var status = "stopped"
 
     val wc = new WaitCriterion {
-      override def done() = {
+      override def done(): Boolean = {
         val output = (snappyProductDir + "/sbin/snappy-status-all.sh").!!
         logInfo(s"Status output: \n$output")
         getCount(output, status) == 4
@@ -686,8 +680,7 @@ class SplitClusterDUnitSecurityTest(s: String)
     }
     DistributedTestBase.waitForCriterion(wc, waitSeconds * 1000, 1000, true)
 
-    logInfo(s"Starting snappy cluster in $snappyProductDir/work")
-    logInfo((snappyProductDir + "/sbin/snappy-start-all.sh").!!)
+    startSnappyCluster()
     waitSeconds = 60
     status = "running"
     DistributedTestBase.waitForCriterion(wc, waitSeconds * 1000, 1000, true)
@@ -1173,18 +1166,17 @@ class SplitClusterDUnitSecurityTest(s: String)
       override def accept(pathname: File): Boolean = {
         pathname.getName.contains("myudf") && pathname.getName.contains("jar")
       }
-    }).foreach(x => println(s"BEFORE DROP  [snappy-jars]: ${x.getAbsolutePath}"))
+    }).foreach(x => logInfo(s"BEFORE DROP  [snappy-jars]: ${x.getAbsolutePath}"))
     server1Dir.listFiles(new FileFilter {
       override def accept(pathname: File): Boolean = {
         pathname.getName.contains("myudf") && pathname.getName.contains("jar")
       }
-    }).foreach(x => println(s"BEFORE DROP  [snappy-jars]: ${x.getAbsolutePath}"))
+    }).foreach(x => logInfo(s"BEFORE DROP  [snappy-jars]: ${x.getAbsolutePath}"))
     server2Dir.listFiles(new FileFilter {
       override def accept(pathname: File): Boolean = {
         pathname.getName.contains("myudf") && pathname.getName.contains("jar")
       }
-    }).foreach(x => println(s"BEFORE DROP  [snappy-jars]: ${x.getAbsolutePath}"))
-
+    }).foreach(x => logInfo(s"BEFORE DROP  [snappy-jars]: ${x.getAbsolutePath}"))
 
     // Drop a function of jdbcUser2
     executeSQL(stmt2, s"drop function myUDF")
@@ -1205,17 +1197,17 @@ class SplitClusterDUnitSecurityTest(s: String)
       override def accept(pathname: File): Boolean = {
         pathname.getName.contains("myudf") && pathname.getName.contains("jar")
       }
-    }).foreach(x => println(s"AFTER DROP  [snappy-jars]: ${x.getAbsolutePath}"))
+    }).foreach(x => logInfo(s"AFTER DROP  [snappy-jars]: ${x.getAbsolutePath}"))
     server1Dir.listFiles(new FileFilter {
       override def accept(pathname: File): Boolean = {
         pathname.getName.contains("myudf") && pathname.getName.contains("jar")
       }
-    }).foreach(x => println(s"AFTER DROP  [snappy-jars]: ${x.getAbsolutePath}"))
+    }).foreach(x => logInfo(s"AFTER DROP  [snappy-jars]: ${x.getAbsolutePath}"))
     server2Dir.listFiles(new FileFilter {
       override def accept(pathname: File): Boolean = {
         pathname.getName.contains("myudf") && pathname.getName.contains("jar")
       }
-    }).foreach(x => println(s"AFTER DROP  [snappy-jars]: ${x.getAbsolutePath}"))
+    }).foreach(x => logInfo(s"AFTER DROP  [snappy-jars]: ${x.getAbsolutePath}"))
 
     // Verify list jars
     stmt2.execute(s"list jars")
@@ -1231,9 +1223,8 @@ class SplitClusterDUnitSecurityTest(s: String)
     }
     assert(rows == 1, s"Expected just 1 UDF, but found $rows")
 
-    logInfo((snappyProductDir + "/sbin/snappy-stop-all.sh").!!)
-
-    logInfo((snappyProductDir + "/sbin/snappy-start-all.sh").!!)
+    stopSnappyCluster(deleteData = false)
+    startSnappyCluster()
 
     user1Conn = getConn(jdbcUser1)
     // Select with the existing UDF
@@ -1453,18 +1444,6 @@ object SplitClusterDUnitSecurityTest extends SplitClusterDUnitTestObject {
   private val locatorPort = AvailablePortHelper.getRandomAvailableUDPPort
   private val locatorNetPort = AvailablePortHelper.getRandomAvailableTCPPort
 
-  def startSparkCluster(productDir: String): Unit = {
-    logInfo(s"Starting spark cluster in $productDir/work")
-    logInfo((productDir + "/sbin/start-all.sh") !!)
-  }
-
-  def stopSparkCluster(productDir: String): Unit = {
-    val sparkContext = SnappyContext.globalSparkContext
-    logInfo(s"Stopping spark cluster in $productDir/work")
-    if (sparkContext != null) sparkContext.stop()
-    logInfo((productDir + "/sbin/stop-all.sh") !!)
-  }
-
   def bootExistingAuthModule(props: Properties): Unit = {
     val bootAuth = new SerializableRunnable() {
       override def run(): Unit = {
diff --git a/core/src/dunit/scala/io/snappydata/cluster/SplitClusterDUnitTest.scala b/core/src/dunit/scala/io/snappydata/cluster/SplitClusterDUnitTest.scala
index e7285d8c25..da69f7a3a0 100644
--- a/core/src/dunit/scala/io/snappydata/cluster/SplitClusterDUnitTest.scala
+++ b/core/src/dunit/scala/io/snappydata/cluster/SplitClusterDUnitTest.scala
@@ -39,7 +39,6 @@ import io.snappydata.util.TestUtils
 import org.apache.commons.io.FileUtils
 import org.junit.Assert
 
-import org.apache.spark.sql.SnappyContext
 import org.apache.spark.sql.types.Decimal
 import org.apache.spark.util.collection.OpenHashSet
 
@@ -75,14 +74,9 @@ class SplitClusterDUnitTest(s: String)
   override def startArgs: Array[AnyRef] = Array(
     SplitClusterDUnitTest.locatorPort, bootProps).asInstanceOf[Array[AnyRef]]
 
-  override val snappyProductDir =
-    testObject.getEnvironmentVariable("SNAPPY_HOME")
+  override protected val sparkProductDir: String = System.getProperty("APACHE_SPARK_HOME")
 
-  override protected val sparkProductDir: String =
-    testObject.getEnvironmentVariable("APACHE_SPARK_HOME").replaceAll("hadoop3.2", "hadoop2.7")
-
-  protected val currentProductDir: String =
-    testObject.getEnvironmentVariable("APACHE_SPARK_CURRENT_HOME").replaceAll("hadoop3.2", "hadoop2.7")
+  protected val currentProductDir: String = System.getProperty("APACHE_SPARK_CURRENT_HOME")
 
   override protected def locatorClientPort = { testObject.locatorNetPort }
 
@@ -91,6 +85,9 @@ class SplitClusterDUnitTest(s: String)
   override def beforeClass(): Unit = {
     super.beforeClass()
 
+    // stop any previous cluster and cleanup data
+    stopSnappyCluster()
+
     // create locators, leads and servers files
     val port = SplitClusterDUnitTest.locatorPort
     val netPort = SplitClusterDUnitTest.locatorNetPort
@@ -110,20 +107,15 @@ class SplitClusterDUnitTest(s: String)
       s"""localhost  -locators=localhost[$port] -client-port=$netPort2 $compressionArg
           |localhost  -locators=localhost[$port] -client-port=$netPort3 $compressionArg
           |""".stripMargin, s"$confDir/servers")
-    (snappyProductDir + "/sbin/snappy-start-all.sh").!!
+    startSnappyCluster()
 
-    vm3.invoke(getClass, "startSparkCluster", sparkProductDir)
+    startSparkCluster(Some(vm3))
   }
 
   override def afterClass(): Unit = {
     super.afterClass()
-    vm3.invoke(getClass, "stopSparkCluster", sparkProductDir)
-
-    logInfo(s"Stopping snappy cluster in $snappyProductDir/work")
-    (snappyProductDir + "/sbin/snappy-stop-all.sh").!!
-    Files.deleteIfExists(Paths.get(snappyProductDir, "conf", "locators"))
-    Files.deleteIfExists(Paths.get(snappyProductDir, "conf", "leads"))
-    Files.deleteIfExists(Paths.get(snappyProductDir, "conf", "servers"))
+    stopSparkCluster(Some(vm3))
+    stopSnappyCluster()
     localDirs.foreach(d => FileUtils.deleteDirectory(new File(d)))
   }
 
@@ -131,19 +123,26 @@ class SplitClusterDUnitTest(s: String)
     // no change to network servers at runtime in this mode
   }
 
-  override def writeToFile(str: String, fileName: String): Unit = super.writeToFile(str, fileName)
-
   override protected def testObject = SplitClusterDUnitTest
 
   // test to make sure that stock spark-shell works with SnappyData core jar
   def testSparkShell(): Unit = {
-    testObject.invokeSparkShell(snappyProductDir, sparkProductDir, locatorClientPort, vm = vm3)
+    SplitClusterDUnitTest.runSparkShellTest(snappyProductDir, sparkProductDir,
+      locatorClientPort, vm = vm3)
   }
 
   // test to make sure that stock spark-shell for latest Spark release works with JDBC pool jar
   def testSparkShellCurrent(): Unit = {
-    testObject.invokeSparkShellCurrent(snappyProductDir, sparkProductDir, currentProductDir,
-      locatorClientPort, new Properties(), vm3)
+    // stop the previous spark cluster else the new one will fail to start due to port conflicts
+    stopSparkCluster()
+    startSparkCluster(productDir = currentProductDir)
+    try {
+      SplitClusterDUnitTest.runSparkShellCurrentTest(snappyProductDir, currentProductDir,
+        locatorClientPort, new Properties(), vm3)
+    } finally {
+      stopSparkCluster(productDir = currentProductDir)
+      startSparkCluster()
+    }
   }
 
   def testSNAP3028(): Unit = {
@@ -203,8 +202,7 @@ class SplitClusterDUnitTest(s: String)
     val locatorPID = new String(Files.readAllBytes(locatorPIDFile)).toInt
     logInfo(s"kill -9 $locatorPID".!!)
 
-    logInfo("Stopping snappy cluster.")
-    logInfo((snappyProductDir + "/sbin/snappy-stop-all.sh").!!)
+    stopSnappyCluster(deleteData = false)
 
     logInfo("Will wait for locator to stop.")
     val waitCriterion: WaitCriterion = new WaitCriterion {
@@ -224,7 +222,7 @@ class SplitClusterDUnitTest(s: String)
 
     logInfo("Starting snappy cluster." +
         " Orphan directories from the previous run should have been deleted.")
-    logInfo(s"$snappyProductDir/sbin/snappy-start-all.sh".!!)
+    startSnappyCluster()
 
     leadBlockManagerDirs.forEach(new Consumer[String] {
       override def accept(t: String): Unit = assert(!Files.exists(Paths.get(t)))
@@ -722,7 +720,7 @@ object SplitClusterDUnitTest extends SplitClusterDUnitTestObject {
 
   private def checkValidJsonString(s: String): Unit = {
     logInfo(s"Checking valid JSON for $s")
-    assert(s.trim().length() > 0)
+    assert(s.trim().nonEmpty)
     try {
       val parser = new ObjectMapper().getFactory.createParser(s)
       while (parser.nextToken() != null) {
@@ -735,23 +733,6 @@ object SplitClusterDUnitTest extends SplitClusterDUnitTestObject {
     throw new AssertionError(s"Failed in parsing as JSON: $s")
   }
 
-  def startSparkCluster(productDir: String): Unit = {
-    logInfo(s"Starting spark cluster in $productDir/work")
-    logInfo((productDir + "/sbin/start-all.sh") !!)
-  }
-
-  def stopSparkCluster(productDir: String): Unit = {
-    stopSpark()
-    logInfo(s"Stopping spark cluster in $productDir/work")
-    logInfo((productDir + "/sbin/stop-all.sh") !!)
-  }
-
-  def stopSpark(): Unit = {
-    logInfo(s" Stopping spark ")
-    val sparkContext = SnappyContext.globalSparkContext
-    if (sparkContext != null) sparkContext.stop()
-  }
-
   private def runSparkShellSnappyPoolTest(stmt: Statement, sparkShellCommand: String): Unit = {
     // create and populate the tables for the pool driver test
     logInfo(s"About to invoke spark-shell with command: $sparkShellCommand")
@@ -782,15 +763,15 @@ object SplitClusterDUnitTest extends SplitClusterDUnitTestObject {
     stmt.execute("drop table testTable1")
   }
 
-  def invokeSparkShell(productDir: String, sparkProductDir: String, locatorClientPort: Int,
+  def runSparkShellTest(productDir: String, sparkProductDir: String, locatorClientPort: Int,
       props: Properties = new Properties(), vm: VM = null): Unit = {
 
     // stop any existing SparkContext, to make sure cpu core available for this test
-    if (vm eq null) stopSpark()
-    else vm.invoke(classOf[SplitClusterDUnitTest], "stopSpark")
+    if (vm eq null) ClusterUtils.stopSpark()
+    else vm.invoke(ClusterUtils, "stopSpark")
 
     // perform some operation thru spark-shell
-    val jars = Files.newDirectoryStream(Paths.get(s"$productDir/../distributions/"),
+    val jars = Files.newDirectoryStream(Paths.get(s"$productDir/../../../../../distributions/"),
       "snappydata-core*.jar")
     var securityConf = ""
     if (props.containsKey(Attribute.USERNAME_ATTR)) {
@@ -803,7 +784,8 @@ object SplitClusterDUnitTest extends SplitClusterDUnitTestObject {
     val scriptFile: String = getClass.getResource("/SparkSqlTestCode.txt").getPath
     val scriptFile2: String = getClass.getResource("/SnappySqlPoolTestCode.txt").getPath
     val hostName = InetAddress.getLocalHost.getHostName
-    val sparkShellCommand = s"$sparkProductDir/bin/spark-shell --master spark://$hostName:7077" +
+    val runDir = ClusterUtils.getSparkClusterDirectory(sparkProductDir)
+    val sparkShellCommand = s"$runDir/bin/spark-shell --master spark://$hostName:7077" +
         " --conf spark.snappydata.connection=localhost:" + locatorClientPort +
         " --conf spark.sql.catalogImplementation=in-memory" +
         s" --jars $snappyDataCoreJar" +
@@ -833,16 +815,16 @@ object SplitClusterDUnitTest extends SplitClusterDUnitTestObject {
     conn.close()
   }
 
-  def invokeSparkShellCurrent(productDir: String, sparkProductDir: String,
-      sparkCurrentProductDir: String, locatorClientPort: Int, props: Properties, vm: VM): Unit = {
-    // stop existing spark cluster and start with current Spark version; stop on vm3 to also close
-    // any existing SparkContext (subsequent tests will need to recreate the SparkContext)
-    if (vm eq null) stopSparkCluster(sparkProductDir)
-    else vm.invoke(classOf[SplitClusterDUnitTest], "stopSparkCluster", sparkProductDir)
-    startSparkCluster(sparkCurrentProductDir)
+  def runSparkShellCurrentTest(productDir: String, sparkCurrentProductDir: String,
+      locatorClientPort: Int, props: Properties, vm: VM): Unit = {
+
+    // stop any existing SparkContext, to make sure cpu core available for this test
+    if (vm eq null) ClusterUtils.stopSpark()
+    else vm.invoke(ClusterUtils, "stopSpark")
+
     try {
       // perform some operations through spark-shell using JDBC pool driver API on current Spark
-      val jars = Files.newDirectoryStream(Paths.get(s"$productDir/../distributions/"),
+      val jars = Files.newDirectoryStream(Paths.get(s"$productDir/../../../../../distributions/"),
         "snappydata-jdbc*.jar")
       var securityConf = ""
       if (props.containsKey(Attribute.USERNAME_ATTR)) {
@@ -854,7 +836,8 @@ object SplitClusterDUnitTest extends SplitClusterDUnitTestObject {
       // SnappySqlPoolTestCode.txt file contains the commands executed on spark-shell
       val scriptFile: String = getClass.getResource("/SnappySqlPoolTestCode.txt").getPath
       val hostName = InetAddress.getLocalHost.getHostName
-      val sparkShellCommand = s"$sparkCurrentProductDir/bin/spark-shell " +
+      val runDir = ClusterUtils.getSparkClusterDirectory(sparkCurrentProductDir)
+      val sparkShellCommand = s"$runDir/bin/spark-shell " +
           s"--master spark://$hostName:7077 --conf spark.snappydata.connection=localhost:" +
           locatorClientPort + " --conf spark.sql.catalogImplementation=in-memory" +
           s" --jars $snappyJdbcJar" + securityConf + s" -i $scriptFile"
@@ -867,8 +850,8 @@ object SplitClusterDUnitTest extends SplitClusterDUnitTestObject {
       stmt.close()
       conn.close()
     } finally {
-      stopSparkCluster(sparkCurrentProductDir)
-      startSparkCluster(sparkProductDir)
+      // start/stop of cluster done by caller now
+      // stopSparkCluster(sparkCurrentProductDir)
     }
   }
 }
diff --git a/core/src/dunit/scala/io/snappydata/cluster/SplitClusterDUnitTestBase.scala b/core/src/dunit/scala/io/snappydata/cluster/SplitClusterDUnitTestBase.scala
index 20a827a618..e39bc5f36c 100644
--- a/core/src/dunit/scala/io/snappydata/cluster/SplitClusterDUnitTestBase.scala
+++ b/core/src/dunit/scala/io/snappydata/cluster/SplitClusterDUnitTestBase.scala
@@ -16,7 +16,6 @@
  */
 package io.snappydata.cluster
 
-import java.io.PrintWriter
 import java.net.InetAddress
 import java.sql.{Connection, DriverManager, Timestamp}
 import java.util.Properties
@@ -25,15 +24,15 @@ import scala.collection.mutable
 import scala.collection.mutable.ArrayBuffer
 import scala.language.postfixOps
 import scala.util.Random
-import scala.util.control.NonFatal
+
 import com.pivotal.gemfirexd.Attribute
 import com.pivotal.gemfirexd.internal.engine.Misc
 import io.snappydata.Property.PlanCaching
 import io.snappydata.test.dunit.{SerializableRunnable, VM}
-import io.snappydata.test.util.TestException
 import io.snappydata.util.TestUtils
 import io.snappydata.{ColumnUpdateDeleteTests, ConcurrentOpsTests, Constant, SnappyFunSuite}
 import org.junit.Assert
+
 import org.apache.spark.sql.catalyst.InternalRow
 import org.apache.spark.sql.collection.{Utils, WrappedInternalRow}
 import org.apache.spark.sql.store.{MetadataTest, StoreUtils}
@@ -46,7 +45,7 @@ case class OrderData(ref: Int, description: String, amount: Long)
 /**
  * Basic tests for non-embedded mode connections to an embedded cluster.
  */
-trait SplitClusterDUnitTestBase extends Logging {
+trait SplitClusterDUnitTestBase extends ClusterUtils with Logging {
 
   def vm0: VM
 
@@ -67,38 +66,10 @@ trait SplitClusterDUnitTestBase extends Logging {
 
   protected def props: Map[String, String] = testObject.props
 
-  protected def sparkProductDir: String
-
   protected def locatorClientPort: Int
 
   protected def startNetworkServers(): Unit
 
-  protected def writeToFile(str: String, fileName: String): Unit = {
-    val pw = new PrintWriter(fileName)
-    try {
-      pw.write(str)
-      pw.flush()
-    } finally {
-      pw.close()
-    }
-    // wait until file becomes available (e.g. running on NFS)
-    var matched = false
-    while (!matched) {
-      Thread.sleep(100)
-      try {
-        val source = scala.io.Source.fromFile(fileName)
-        val lines = try {
-          source.mkString
-        } finally {
-          source.close()
-        }
-        matched = lines == str
-      } catch {
-        case NonFatal(_) =>
-      }
-    }
-  }
-
   def doTestColumnTableCreation(): Unit = {
     // Embedded Cluster Operations
     testObject.createTablesAndInsertData("column")
@@ -288,23 +259,36 @@ trait SplitClusterDUnitTestObject extends Logging {
     TestUtils.dropAllSchemas(session)
 
     // first check metadata queries using session and JDBC connection
-    val locatorNetServer = s"localhost/127.0.0.1[$locatorClientPort]"
+    var locatorNetServer = s"localhost/127.0.0.1[$locatorClientPort]"
+    val locatorNetServers = Set(s"localhost[$locatorClientPort]",
+      s"127.0.0.1/127.0.0.1[$locatorClientPort]", s"127.0.0.1[$locatorClientPort]")
     // get member IDs using JDBC connection
     val jdbcConn = getConnection(locatorClientPort)
     var stmt = jdbcConn.createStatement()
 
-    val rs = stmt.executeQuery("select id, kind, netServers from sys.members")
+    val rs = stmt.executeQuery("select id, kind, netServers, host from sys.members")
     var locatorId = ""
     var leadId = ""
+    var locatorHost = ""
+    var hostName = ""
     val servers = new mutable.ArrayBuffer[String](2)
     val netServers = new mutable.ArrayBuffer[String](2)
     while (rs.next()) {
       val id = rs.getString(1)
       val thriftServers = rs.getString(3)
       rs.getString(2) match {
-        case "locator" => assert(thriftServers == locatorNetServer); locatorId = id
+        case "locator" =>
+          if (thriftServers != locatorNetServer) {
+            assert(locatorNetServers.contains(thriftServers))
+            locatorNetServer = thriftServers
+          }
+          locatorId = id
+          locatorHost = rs.getString(4)
         case "primary lead" => assert(thriftServers.isEmpty); leadId = id
-        case "datastore" => servers += id; netServers += thriftServers
+        case "datastore" =>
+          servers += id
+          netServers += thriftServers
+          hostName = rs.getString(4)
         case kind => assert(assertion = false, s"unexpected node type = $kind")
       }
     }
@@ -316,7 +300,7 @@ trait SplitClusterDUnitTestObject extends Logging {
 
     // first test metadata using session
     MetadataTest.testSYSTablesAndVTIs(session.sql,
-      hostName = "localhost", netServers, locatorId, locatorNetServer, servers, leadId)
+      hostName, netServers, locatorId, locatorHost, locatorNetServer, servers, leadId)
     val planCaching = PlanCaching.get(session.sessionState.conf)
     MetadataTest.testDescribeShowAndExplain(session.sql, jdbcStmt = null, planCaching)
     MetadataTest.testDSIDWithSYSTables(session.sql,
@@ -324,7 +308,7 @@ trait SplitClusterDUnitTestObject extends Logging {
     // next test metadata using JDBC connection
     stmt = jdbcConn.createStatement()
     MetadataTest.testSYSTablesAndVTIs(SnappyFunSuite.resultSetToDataset(session, stmt),
-      hostName = "localhost", netServers, locatorId, locatorNetServer, servers, leadId)
+      hostName, netServers, locatorId, locatorHost, locatorNetServer, servers, leadId)
     MetadataTest.testDescribeShowAndExplain(SnappyFunSuite.resultSetToDataset(session, stmt),
       stmt, planCaching)
     MetadataTest.testDSIDWithSYSTables(SnappyFunSuite.resultSetToDataset(session, stmt),
@@ -399,7 +383,7 @@ trait SplitClusterDUnitTestObject extends Logging {
         .setMaster(s"spark://$hostName:7077")
         .set("spark.executor.cores", TestUtils.defaultCoresForSmartConnector)
         .set("spark.executor.extraClassPath",
-          getEnvironmentVariable("SNAPPY_DIST_CLASSPATH"))
+          ClusterUtils.getEnvironmentVariable("SNAPPY_DIST_CLASSPATH"))
         .set("snappydata.connection", connectionURL)
         .set("snapptdata.sql.planCaching", random.nextBoolean().toString)
       .set(io.snappydata.Property.TestDisableCodeGenFlag.name, "false")
@@ -414,18 +398,18 @@ trait SplitClusterDUnitTestObject extends Logging {
       }
     }
 
-      val sc = SparkContext.getOrCreate(conf)
+    val sc = SparkContext.getOrCreate(conf)
 //      sc.setLogLevel("DEBUG")
 //      Logger.getLogger("org").setLevel(Level.DEBUG)
 //      Logger.getLogger("akka").setLevel(Level.DEBUG)
-      val snc = SnappyContext(sc)
+    val snc = SnappyContext(sc)
 
-      val mode = SnappyContext.getClusterMode(snc.sparkContext)
-      mode match {
-        case ThinClientConnectorMode(_, _) => // expected
-        case _ => assert(assertion = false, "cluster mode is " + mode)
-      }
-      snc
+    val mode = SnappyContext.getClusterMode(snc.sparkContext)
+    mode match {
+      case ThinClientConnectorMode(_, _) => // expected
+      case _ => assert(assertion = false, "cluster mode is " + mode)
+    }
+    snc
   }
 
   def createTableUsingDataSourceAPI(snc: SnappyContext,
@@ -540,13 +524,6 @@ trait SplitClusterDUnitTestObject extends Logging {
     data
   }
 
-  def getEnvironmentVariable(env: String): String = {
-    val value = scala.util.Properties.envOrElse(env, null)
-    if (env == null) {
-      throw new TestException(s"Environment variable $env is not defined")
-    }
-    value
-  }
   def validateNoActiveSnapshotTX(): Unit = {
     val cache = Misc.getGemFireCacheNoThrow
     if (cache eq null) return
diff --git a/core/src/dunit/scala/org/apache/spark/sql/streaming/SnappySinkProviderDUnitTest.scala b/core/src/dunit/scala/org/apache/spark/sql/streaming/SnappySinkProviderDUnitTest.scala
index a3c9828ee0..4693731101 100644
--- a/core/src/dunit/scala/org/apache/spark/sql/streaming/SnappySinkProviderDUnitTest.scala
+++ b/core/src/dunit/scala/org/apache/spark/sql/streaming/SnappySinkProviderDUnitTest.scala
@@ -17,24 +17,19 @@
 
 package org.apache.spark.sql.streaming
 
-import java.io.PrintWriter
 import java.net.InetAddress
-import java.nio.file.{Files, Paths}
 import java.sql.Connection
 import java.util.Properties
 import java.util.concurrent.atomic.AtomicInteger
 
 import scala.reflect.io.Path
-import scala.sys.process._
-import scala.util.control.NonFatal
 
 import com.pivotal.gemfirexd.Attribute
 import com.pivotal.gemfirexd.Property.{AUTH_LDAP_SEARCH_BASE, AUTH_LDAP_SERVER}
 import com.pivotal.gemfirexd.security.{LdapTestServer, SecurityTestUtils}
 import io.snappydata.Constant
-import io.snappydata.cluster.SplitClusterDUnitTest
+import io.snappydata.cluster.{ClusterUtils, SplitClusterDUnitTest}
 import io.snappydata.test.dunit.{AvailablePortHelper, DistributedTestBase, Host, VM}
-import io.snappydata.test.util.TestException
 import io.snappydata.util.TestUtils
 import org.junit.Assert
 
@@ -50,9 +45,7 @@ import org.apache.spark.{Logging, SparkConf, SparkContext}
  * Contains tests for streaming sink in smart connector mode
  */
 class SnappySinkProviderDUnitTest(s: String)
-    extends DistributedTestBase(s)
-        with Logging
-        with Serializable {
+    extends DistributedTestBase(s) with ClusterUtils with Logging with Serializable {
 
   // reduce minimum compression size so that it happens for all the values for testing
   private def compressionMinSize = "128"
@@ -94,6 +87,9 @@ class SnappySinkProviderDUnitTest(s: String)
   override def beforeClass(): Unit = {
     super.beforeClass()
 
+    // stop any previous cluster and cleanup data
+    stopSnappyCluster()
+
     setSecurityProps()
 
     // create locators, leads and servers files
@@ -118,10 +114,9 @@ class SnappySinkProviderDUnitTest(s: String)
          |localhost  -locators=localhost[$port] -client-port=$netPort3 $compressionArg $ldapConf
          |""".stripMargin, s"$confDir/servers")
 
-    val op = (snappyProductDir + "/sbin/snappy-start-all.sh").!!
-    logInfo("snappy-start-all output:" + op)
+    startSnappyCluster()
 
-    vm.invoke(getClass, "startSparkCluster", sparkProductDir)
+    startSparkCluster(Some(vm))
 
     var connection: Connection = null
     try {
@@ -144,20 +139,12 @@ class SnappySinkProviderDUnitTest(s: String)
 
   override def afterClass(): Unit = {
     super.afterClass()
-    vm.invoke(getClass, "stopSparkCluster", sparkProductDir)
+    stopSparkCluster(Some(vm))
     stopLdapTestServer()
-    logInfo(s"Stopping snappy cluster in $snappyProductDir/work")
-    (snappyProductDir + "/sbin/snappy-stop-all.sh").!!
-    Files.deleteIfExists(Paths.get(snappyProductDir, "conf", "locators"))
-    Files.deleteIfExists(Paths.get(snappyProductDir, "conf", "leads"))
-    Files.deleteIfExists(Paths.get(snappyProductDir, "conf", "servers"))
-    Files.move(Paths.get(snappyProductDir, "work"), Paths.get(snappyProductDir,
-      "work-SnappySinkProviderDUnitTest"))
+    stopSnappyCluster()
   }
 
-  private val snappyProductDir = getEnvironmentVariable("SNAPPY_HOME")
-
-  private val sparkProductDir = getEnvironmentVariable("APACHE_SPARK_HOME").replaceAll("hadoop3.2", "hadoop2.7")
+  override protected val sparkProductDir = System.getProperty("APACHE_SPARK_HOME")
 
   def testStructuredStreaming(): Unit = {
     vm.invoke(getClass, "doTestStructuredStreaming",
@@ -183,40 +170,6 @@ class SnappySinkProviderDUnitTest(s: String)
     vm.invoke(getClass, "doTestAllowOnlyOneSnappySinkQueryPerSession",
       Int.box(locatorNetPort))
   }
-
-  private def writeToFile(str: String, fileName: String): Unit = {
-    val pw = new PrintWriter(fileName)
-    try {
-      pw.write(str)
-      pw.flush()
-    } finally {
-      pw.close()
-    }
-    // wait until file becomes available (e.g. running on NFS)
-    var matched = false
-    while (!matched) {
-      Thread.sleep(100)
-      try {
-        val source = scala.io.Source.fromFile(fileName)
-        val lines = try {
-          source.mkString
-        } finally {
-          source.close()
-        }
-        matched = lines == str
-      } catch {
-        case NonFatal(_) =>
-      }
-    }
-  }
-
-  def getEnvironmentVariable(env: String): String = {
-    val value = scala.util.Properties.envOrElse(env, null)
-    if (env == null) {
-      throw new TestException(s"Environment variable $env is not defined")
-    }
-    value
-  }
 }
 
 object SnappySinkProviderDUnitTest extends Logging {
@@ -254,26 +207,6 @@ object SnappySinkProviderDUnitTest extends Logging {
     kafkaTestUtils.teardown()
   }
 
-  def getEnvironmentVariable(env: String): String = {
-    val value = scala.util.Properties.envOrElse(env, null)
-    if (env == null) {
-      throw new TestException(s"Environment variable $env is not defined")
-    }
-    value
-  }
-
-  def startSparkCluster(productDir: String): Unit = {
-    logInfo(s"Starting spark cluster in $productDir/work")
-    (productDir + "/sbin/start-all.sh").!!
-  }
-
-  def stopSparkCluster(productDir: String): Unit = {
-    val sparkContext = SnappyContext.globalSparkContext
-    logInfo(s"Stopping spark cluster in $productDir/work")
-    if (sparkContext != null) sparkContext.stop()
-    (productDir + "/sbin/stop-all.sh").!!
-  }
-
   def doTestStructuredStreaming(locatorClientPort: Int): Unit = {
     try {
       val testId = s"test_${testIdGenerator.getAndIncrement()}"
@@ -517,7 +450,7 @@ object SnappySinkProviderDUnitTest extends Logging {
         .setMaster(s"spark://$hostName:7077")
         .set("spark.executor.cores", TestUtils.defaultCoresForSmartConnector)
         .set("spark.executor.extraClassPath",
-          getEnvironmentVariable("SNAPPY_DIST_CLASSPATH"))
+          ClusterUtils.getEnvironmentVariable("SNAPPY_DIST_CLASSPATH"))
         .set("snappydata.connection", connectionURL)
 
     conf.set(Constant.SPARK_STORE_PREFIX + Attribute.USERNAME_ATTR, user)
diff --git a/core/src/main/scala/org/apache/spark/sql/SnappySession.scala b/core/src/main/scala/org/apache/spark/sql/SnappySession.scala
index a5cd1e5477..465663d6f2 100644
--- a/core/src/main/scala/org/apache/spark/sql/SnappySession.scala
+++ b/core/src/main/scala/org/apache/spark/sql/SnappySession.scala
@@ -635,13 +635,13 @@ class SnappySession(_sc: SparkContext) extends SparkSession(_sc) {
   }
 
   private[sql] def releaseLock(lock: Any): Unit = {
-    logInfo(s"Releasing the lock : $lock")
+    logDebug(s"Releasing the lock : $lock")
     lock match {
       case lock: RegionLock =>
         if (lock != null) {
-          logInfo(s"Going to unlock the lock object bulkOp $lock and " +
+          logDebug(s"Going to unlock the lock object bulkOp $lock and " +
             s"app ${sqlContext.sparkContext.appName}")
-          lock.asInstanceOf[PartitionedRegion.RegionLock].unlock()
+          lock.unlock()
         }
       case (conn: Connection, id: TableIdentifier) =>
         var unlocked = false
diff --git a/core/src/main/scala/org/apache/spark/sql/execution/columnar/impl/ColumnFormatRelation.scala b/core/src/main/scala/org/apache/spark/sql/execution/columnar/impl/ColumnFormatRelation.scala
index 9670f1974e..3c2a81de62 100644
--- a/core/src/main/scala/org/apache/spark/sql/execution/columnar/impl/ColumnFormatRelation.scala
+++ b/core/src/main/scala/org/apache/spark/sql/execution/columnar/impl/ColumnFormatRelation.scala
@@ -17,9 +17,7 @@
 package org.apache.spark.sql.execution.columnar.impl
 
 import java.sql.{Connection, PreparedStatement}
-import java.util
 
-import scala.collection.AbstractIterator
 import scala.util.control.NonFatal
 
 import com.gemstone.gemfire.internal.cache.{ExternalTableMetaData, LocalRegion, PartitionedRegion}
@@ -159,7 +157,7 @@ abstract class BaseColumnFormatRelation(
     val (rdd, projection) = scanTable(table, requiredColumns, filters, () => -1)
     val rowRDD = buildRowBufferRDD(() => rdd.partitions, requiredColumns, filters,
       useResultSet = true, projection)
-    (rdd.asInstanceOf[RDD[Any]], rowRDD.asInstanceOf[RDD[Any]], Nil)
+    (rdd, rowRDD, Nil)
   }
 
   def buildRowBufferRDD(partitionEvaluator: () => Array[Partition],
@@ -210,7 +208,7 @@ abstract class BaseColumnFormatRelation(
 
   override def getBasicInsertPlan(relation: LogicalRelation,
       child: SparkPlan): SparkPlan = {
-    withTableWriteLock() { () =>
+    withTableWriteLock { () =>
       new ColumnInsertExec(child, partitionColumns, partitionExpressions(relation),
         this, externalColumnTableName)
     }
@@ -238,7 +236,7 @@ abstract class BaseColumnFormatRelation(
   override def getUpdatePlan(relation: LogicalRelation, child: SparkPlan,
       updateColumns: Seq[Attribute], updateExpressions: Seq[Expression],
       keyColumns: Seq[Attribute]): SparkPlan = {
-    withTableWriteLock() { () =>
+    withTableWriteLock { () =>
       ColumnUpdateExec(child, externalColumnTableName, partitionColumns,
         partitionExpressions(relation), numBuckets, isPartitioned, schema, externalStore, this,
         updateColumns, updateExpressions, keyColumns, connProperties, onExecutor = false)
@@ -251,7 +249,7 @@ abstract class BaseColumnFormatRelation(
    */
   override def getDeletePlan(relation: LogicalRelation, child: SparkPlan,
       keyColumns: Seq[Attribute]): SparkPlan = {
-    withTableWriteLock() { () =>
+    withTableWriteLock { () =>
       ColumnDeleteExec(child, externalColumnTableName, partitionColumns,
         partitionExpressions(relation), numBuckets, isPartitioned, schema, externalStore,
         this, keyColumns, connProperties, onExecutor = false)
@@ -275,10 +273,12 @@ abstract class BaseColumnFormatRelation(
     // use bulk insert directly into column store for large number of rows
 
     val snc = sqlContext.sparkSession.asInstanceOf[SnappySession]
-    val lockOption = snc.getContextObject[(Option[TableIdentifier], PartitionedRegion.RegionLock)](
-      SnappySession.PUTINTO_LOCK) match {
-      case None if (Property.SerializeWrites.get(snc.sessionState.conf)) =>
-        snc.grabLock(table, schemaName, connProperties)
+    val lockOption = snc.getContextObject(SnappySession.PUTINTO_LOCK) match {
+      case None if Property.SerializeWrites.get(snc.sessionState.conf) =>
+        snc.getContextObject(SnappySession.BULKWRITE_LOCK) match {
+          case None => snc.grabLock(table, schemaName, connProperties)
+          case _ => None // BulkWrite lock already acquired
+        }
       case _ => None // Do nothing as putInto will release lock
     }
     try {
@@ -304,22 +304,20 @@ abstract class BaseColumnFormatRelation(
     }
     finally {
       lockOption match {
-        case Some(lock) => {
+        case Some(lock) =>
           logDebug(s"Releasing the $lock object in InsertRows")
           snc.releaseLock(lock)
-        }
         case None => // do Nothing
       }
     }
   }
 
-  def withTableWriteLock()(f: () => SparkPlan): SparkPlan = {
+  def withTableWriteLock(f: () => SparkPlan): SparkPlan = {
     val snc = sqlContext.sparkSession.asInstanceOf[SnappySession]
     logDebug(s"WithTable WriteLock ${SnappyContext.executorAssigned}")
 
-    val lockOption = snc.getContextObject[(Option[TableIdentifier], PartitionedRegion.RegionLock)](
-      SnappySession.PUTINTO_LOCK) match {
-      case None if (Property.SerializeWrites.get(snc.sessionState.conf)) =>
+    val lockOption = snc.getContextObject(SnappySession.PUTINTO_LOCK) match {
+      case None if Property.SerializeWrites.get(snc.sessionState.conf) =>
         snc.grabLock(table, schemaName, connProperties)
       case _ => None // Do nothing as putInto will release lock
     }
@@ -328,11 +326,10 @@ abstract class BaseColumnFormatRelation(
     }
     finally {
       lockOption match {
-        case Some(lock) => {
+        case Some(lock) =>
           logDebug(s"Added the $lock object to the context for $table")
           snc.addContextObject(
             SnappySession.BULKWRITE_LOCK, lock)
-        }
         case None => // do nothing
       }
     }
diff --git a/core/src/test/scala/io/snappydata/CommandLineToolsSuite.scala b/core/src/test/scala/io/snappydata/CommandLineToolsSuite.scala
index c1ab32c88e..6f6d5cef19 100644
--- a/core/src/test/scala/io/snappydata/CommandLineToolsSuite.scala
+++ b/core/src/test/scala/io/snappydata/CommandLineToolsSuite.scala
@@ -31,7 +31,7 @@ class CommandLineToolsSuite extends SnappyTestRunner {
 
   override def clusterSuccessString: String = "Distributed system now has 3 members"
 
-  private val snappyProductDir = System.getenv("SNAPPY_HOME")
+  private val snappyProductDir = System.getProperty("SNAPPY_HOME")
   private val snappyNativeTestDir = s"$snappyProductDir/../../../store/native/tests"
 
   test("exec scala") {
diff --git a/core/src/test/scala/io/snappydata/ConcurrentOpsTests.scala b/core/src/test/scala/io/snappydata/ConcurrentOpsTests.scala
index ed730247ee..ef1e2ccfb2 100644
--- a/core/src/test/scala/io/snappydata/ConcurrentOpsTests.scala
+++ b/core/src/test/scala/io/snappydata/ConcurrentOpsTests.scala
@@ -19,17 +19,18 @@ package io.snappydata
 
 import java.util.concurrent.atomic.AtomicInteger
 
+import scala.concurrent.ExecutionContext.Implicits.global
+import scala.concurrent.duration.Duration
+import scala.concurrent.{Await, Future}
+
 import io.snappydata.core.TestData
-import org.apache.spark.Logging
-import org.apache.spark.sql.SnappySession
 import org.scalatest.Assertions
 
-import scala.concurrent.duration.Duration
-import scala.concurrent.{Await, Future}
+import org.apache.spark.Logging
+import org.apache.spark.sql.SnappySession
 
 object ConcurrentOpsTests extends Assertions with Logging {
 
-
   def testSimpleLockInsert(session: SnappySession): Unit = {
     val tableName = "ColumnTable"
     session.sql(s"drop table if exists $tableName")
@@ -114,7 +115,6 @@ object ConcurrentOpsTests extends Assertions with Logging {
     dataDF.write.putInto(tableName)
     dataDF.write.deleteFrom(tableName)
 
-
     val t = new Thread(new Runnable {
       override def run(): Unit = {
         val snc = new SnappySession(session.sparkContext)
@@ -175,7 +175,6 @@ object ConcurrentOpsTests extends Assertions with Logging {
       "KEY_COLUMNS 'Key1'," +
       "BUCKETS '1')")
 
-    import scala.concurrent.ExecutionContext.Implicits.global
     val doPut = () => Future {
       val newSnc = new SnappySession(snc.sparkContext)
       val rdd = newSnc.sparkContext.parallelize(
@@ -222,8 +221,6 @@ object ConcurrentOpsTests extends Assertions with Logging {
     val r2 = result.collect
     assert(r2.length == 2000)
 
-    import scala.concurrent.ExecutionContext.Implicits.global
-
     val doUpdate = () => Future {
       val snc = new SnappySession(session.sparkContext)
       val rdd = snc.sparkContext.parallelize(
@@ -261,7 +258,6 @@ object ConcurrentOpsTests extends Assertions with Logging {
     val r2 = result.collect
     assert(r2.length == 2000)
 
-    import scala.concurrent.ExecutionContext.Implicits.global
     val doDelete = () => Future {
       val snc = new SnappySession(session.sparkContext)
       snc.sql("delete FROM " + tableName)
@@ -291,7 +287,6 @@ object ConcurrentOpsTests extends Assertions with Logging {
       "KEY_COLUMNS 'Key1'," +
       "BUCKETS '1')")
 
-    import scala.concurrent.ExecutionContext.Implicits.global
     val doPut = () => Future {
       val snc = new SnappySession(session.sparkContext)
       val rdd = snc.sparkContext.parallelize(
@@ -334,8 +329,6 @@ object ConcurrentOpsTests extends Assertions with Logging {
       "KEY_COLUMNS 'Key1'," +
       "BUCKETS '1')")
 
-    import scala.concurrent.ExecutionContext.Implicits.global
-
     val doInsert = () => Future {
       val snc = new SnappySession(session.sparkContext)
       val rdd = snc.sparkContext.parallelize(
@@ -436,7 +429,6 @@ object ConcurrentOpsTests extends Assertions with Logging {
       "KEY_COLUMNS 'Key1'," +
       "BUCKETS '1')")
 
-    import scala.concurrent.ExecutionContext.Implicits.global
     val doPut = (table: String) => Future {
       val snc = new SnappySession(session.sparkContext)
       val rdd = snc.sparkContext.parallelize(
@@ -507,20 +499,20 @@ object ConcurrentOpsTests extends Assertions with Logging {
       "KEY_COLUMNS 'Key1'," +
       "BUCKETS '1')")
 
-    import scala.concurrent.ExecutionContext.Implicits.global
-    val doPut = (table: String) => Future {
+    val doInsert = (table: String) => Future {
       val snc = new SnappySession(session.sparkContext)
       val rdd = session.sparkContext.parallelize(
         (1 to 2000).map(i => TestData(i, i.toString)))
       val dataDF = snc.createDataFrame(rdd)
       import org.apache.spark.sql.snappy._
-      dataDF.write.putInto(table)
+      dataDF.write.insertInto(table)
       val result = snc.sql("SELECT * FROM " + table)
-      val r2 = result.collect
+      val r2 = result.collect()
       assert(r2.length == 2000)
     }
 
-    Seq(tableName, tableName2, tableName3, tableName4).foreach(doPut(_))
+    val inserts = Seq(tableName, tableName2, tableName3, tableName4).map(doInsert(_))
+    inserts.foreach(Await.result(_, Duration.Inf))
 
     var counter = new AtomicInteger(0)
 
@@ -534,11 +526,10 @@ object ConcurrentOpsTests extends Assertions with Logging {
       dataDF.filter(s"key1 <= $maxKey").write.deleteFrom(table)
 
       val result = snc.sql("SELECT * FROM " + table)
-      val r2 = result.collect
+      val r2 = result.collect()
       logInfo(s"SKSK The size of $table is ${r2.length}")
     }
 
-
     val delTasks = Array.fill(5)(doDelete(tableName, counter.addAndGet(500)))
     counter = new AtomicInteger(0)
     val delTasks2 = Array.fill(5)(doDelete(tableName2, counter.addAndGet(500)))
@@ -547,7 +538,6 @@ object ConcurrentOpsTests extends Assertions with Logging {
     counter = new AtomicInteger(0)
     val delTasks4 = Array.fill(5)(doDelete(tableName4, counter.addAndGet(500)))
 
-
     delTasks.foreach(Await.result(_, Duration.Inf))
     delTasks2.foreach(Await.result(_, Duration.Inf))
     delTasks3.foreach(Await.result(_, Duration.Inf))
diff --git a/core/src/test/scala/io/snappydata/SnappyFunSuite.scala b/core/src/test/scala/io/snappydata/SnappyFunSuite.scala
index 1f488bd3ed..6cb2838189 100644
--- a/core/src/test/scala/io/snappydata/SnappyFunSuite.scala
+++ b/core/src/test/scala/io/snappydata/SnappyFunSuite.scala
@@ -22,9 +22,10 @@ import java.sql.Statement
 import scala.collection.mutable.ArrayBuffer
 
 import com.gemstone.gemfire.internal.shared.NativeCalls
+import com.pivotal.gemfirexd.TestUtil
 import io.snappydata.core.{FileCleaner, LocalSparkConf}
 import io.snappydata.test.dunit.DistributedTestBase
-import io.snappydata.test.dunit.DistributedTestBase.{InitializeRun, WaitCriterion}
+import io.snappydata.test.dunit.DistributedTestBase.WaitCriterion
 import io.snappydata.util.TestUtils
 import org.scalatest.Assertions
 
@@ -53,7 +54,7 @@ abstract class SnappyFunSuite
         with Serializable
         with Logging with Retries {
 
-  InitializeRun.setUp()
+  TestUtil.globalSetUp()
 
   private val nativeCalls = NativeCalls.getInstance()
   nativeCalls.setEnvironment("gemfire.bind-address", "localhost")
diff --git a/core/src/test/scala/org/apache/spark/sql/store/MetadataTest.scala b/core/src/test/scala/org/apache/spark/sql/store/MetadataTest.scala
index 1b1921ccf3..e54fc76ed8 100644
--- a/core/src/test/scala/org/apache/spark/sql/store/MetadataTest.scala
+++ b/core/src/test/scala/org/apache/spark/sql/store/MetadataTest.scala
@@ -117,7 +117,9 @@ object MetadataTest extends Assertions {
 
   def testSYSTablesAndVTIs(executeSQL: String => Dataset[Row],
       hostName: String = ClientSharedUtils.getLocalHost.getCanonicalHostName,
-      netServers: Seq[String] = Seq(""), locator: String = "", locatorNetServer: String = "",
+      netServers: Seq[String] = Seq(""), locatorId: String = "",
+      locatorHost: String = ClientSharedUtils.getLocalHost.getCanonicalHostName,
+      locatorNetServer: String = "",
       servers: Seq[String] = Nil, lead: String = ""): Unit = {
     var ds: Dataset[Row] = null
     var expectedColumns: List[String] = null
@@ -134,7 +136,7 @@ object MetadataTest extends Assertions {
 
     // check for the single VM case or else the provided nodes
     def checkMembers(rs: Array[Row], forShow: Boolean): Unit = {
-      if (locator.isEmpty) {
+      if (locatorId.isEmpty) {
         assert(rs.length === 1)
         if (forShow) {
           expectedRow = Row(myId, hostName, "loner", "RUNNING", netServers.head, "")
@@ -143,14 +145,14 @@ object MetadataTest extends Assertions {
         }
         assert(rs(0) === expectedRow)
       } else {
-        assert(rs.length === 2 + servers.length)
+        assert(rs.length === 2 + servers.length, rs.toSeq)
         if (forShow) {
-          expectedRows = Row(locator, hostName, "locator", "RUNNING", locatorNetServer, "") +:
+          expectedRows = Row(locatorId, locatorHost, "locator", "RUNNING", locatorNetServer, "") +:
               Row(lead, hostName, "primary lead", "RUNNING", "", "") +:
               servers.zip(netServers).map(p => Row(p._1, hostName, "datastore",
                 "RUNNING", p._2, ""))
         } else {
-          expectedRows = Row(locator, "locator", "RUNNING", false, true, locatorNetServer, "") +:
+          expectedRows = Row(locatorId, "locator", "RUNNING", false, true, locatorNetServer, "") +:
               Row(lead, "primary lead", "RUNNING", false, false, "", "") +:
               servers.zip(netServers).map(p => Row(p._1, "datastore",
                 "RUNNING", true, false, p._2, ""))
@@ -201,7 +203,7 @@ object MetadataTest extends Assertions {
 
     rs = executeSQL("select * from sys.diskStoreIds").collect()
     // datadictionary, delta and "default" diskStores are created by default
-    if (locator.isEmpty) {
+    if (locatorId.isEmpty) {
       assert(rs.length === 3)
       assert(rs.map(r => r.getString(0) -> r.getString(1)).sorted === Array(
         myId -> "GFXD-DD-DISKSTORE", myId -> "GFXD-DEFAULT-DISKSTORE",
@@ -210,7 +212,7 @@ object MetadataTest extends Assertions {
       // expect default disk stores on all the nodes (2 on locator, 1 on lead and 3 on server)
       assert(rs.length === 3 + 3 * servers.length)
       assert(rs.map(r => r.getString(0) -> r.getString(1)).toSeq.sorted === (Seq(
-        locator -> "GFXD-DD-DISKSTORE", locator -> "GFXD-DEFAULT-DISKSTORE",
+        locatorId -> "GFXD-DD-DISKSTORE", locatorId -> "GFXD-DEFAULT-DISKSTORE",
         lead -> "GFXD-DEFAULT-DISKSTORE") ++
           servers.flatMap(s => Seq(s -> "GFXD-DD-DISKSTORE", s -> "GFXD-DEFAULT-DISKSTORE",
             s -> "SNAPPY-INTERNAL-DELTA"))).sorted)
diff --git a/docs/security/authentication_connecting_to_a_secure_cluster.md b/docs/security/authentication_connecting_to_a_secure_cluster.md
index 5bf4e1cc52..fc71973f34 100644
--- a/docs/security/authentication_connecting_to_a_secure_cluster.md
+++ b/docs/security/authentication_connecting_to_a_secure_cluster.md
@@ -48,7 +48,7 @@ val conf = new SparkConf()
     .setMaster(s"spark://$hostName:7077")
     .set("spark.executor.cores", TestUtils.defaultCores.toString)
     .set("spark.executor.extraClassPath",
-      getEnvironmentVariable("SNAPPY_HOME") + "/jars/*" )
+      System.getenv("SNAPPY_HOME") + "/jars/*" )
     .set("snappydata.connection", snappydataLocatorURL)
     .set("spark.snappydata.store.user", username)
     .set("spark.snappydata.store.password", password)
diff --git a/dtests/build.gradle b/dtests/build.gradle
index 2c990e5035..37bfea3caa 100644
--- a/dtests/build.gradle
+++ b/dtests/build.gradle
@@ -18,12 +18,10 @@
 group 'io.snappydata'
 version '0.1.0-SNAPSHOT'
 
-
 apply plugin: 'scala'
 
 compileScala.options.encoding = 'UTF-8'
 
-
 // fix scala+java mix to all use compileScala which uses correct dependency order
 sourceSets.main.scala.srcDir 'src/main/java'
 sourceSets.main.java.srcDirs = []
@@ -31,86 +29,75 @@ sourceSets.main.java.srcDirs = []
 sourceSets.test.scala.srcDir "src/test/java"
 sourceSets.test.java.srcDirs = []
 
-
-repositories {
-    mavenCentral()
-}
-
-ext {
-    subprojectBase = ':snappy-store:'
-    osName = org.gradle.internal.os.OperatingSystem.current()
-}
-
 dependencies {
-    compile 'org.scala-lang:scala-library:' + scalaVersion
-    compile 'org.scala-lang:scala-reflect:' + scalaVersion
-
-    compile (project(':snappy-core_' + scalaBinaryVersion)) {
-       exclude(group: 'org.apache.spark', module: 'spark-unsafe_' + scalaBinaryVersion)
-       exclude(group: 'org.apache.spark', module: 'spark-core_' + scalaBinaryVersion)
-       exclude(group: 'org.apache.spark', module: 'spark-catalyst_' + scalaBinaryVersion)
-       exclude(group: 'org.apache.spark', module: 'spark-sql_' + scalaBinaryVersion)
-       exclude(group: 'org.apache.spark', module: 'spark-hive_' + scalaBinaryVersion)
-       exclude(group: 'org.apache.spark', module: 'spark-streaming_' + scalaBinaryVersion)
-       exclude(group: 'org.apache.spark', module: 'spark-streaming-kafka-0-10_' + scalaBinaryVersion)
-       exclude(group: 'org.apache.spark', module: 'spark-sql-kafka-0-10_' + scalaBinaryVersion)
-       exclude(group: 'org.apache.spark', module: 'spark-mllib_' + scalaBinaryVersion)
-       exclude(group: 'org.eclipse.jetty', module: 'jetty-servlet')
-    }
-    if (new File(rootDir, 'spark/build.gradle').exists()) {
-        testCompile (project(path: ':snappy-core_' + scalaBinaryVersion, configuration: 'testOutput')) {
-          exclude(group: 'org.apache.spark', module: 'spark-unsafe_' + scalaBinaryVersion)
-          exclude(group: 'org.apache.spark', module: 'spark-core_' + scalaBinaryVersion)
-          exclude(group: 'org.apache.spark', module: 'spark-catalyst_' + scalaBinaryVersion)
-          exclude(group: 'org.apache.spark', module: 'spark-sql_' + scalaBinaryVersion)
-          exclude(group: 'org.apache.spark', module: 'spark-hive_' + scalaBinaryVersion)
-          exclude(group: 'org.apache.spark', module: 'spark-streaming_' + scalaBinaryVersion)
-          exclude(group: 'org.apache.spark', module: 'spark-streaming-kafka-0-10_' + scalaBinaryVersion)
-          exclude(group: 'org.apache.spark', module: 'spark-sql-kafka-0-10_' + scalaBinaryVersion)
-          exclude(group: 'org.apache.spark', module: 'spark-mllib_' + scalaBinaryVersion)
-          exclude(group: 'org.eclipse.jetty', module: 'jetty-servlet')
-        }
-        compile project(':snappy-spark:snappy-spark-repl_' + scalaBinaryVersion)
-        compile project(':snappy-spark:snappy-spark-yarn_' + scalaBinaryVersion)
-        compile project(':snappy-spark:snappy-spark-graphx_' + scalaBinaryVersion)
-        compile project(':snappy-spark:snappy-spark-hive-thriftserver_' + scalaBinaryVersion)
-    } else {
-        compile 'io.snappydata:snappy-spark-repl_' + scalaBinaryVersion + ':' + snappySparkVersion
-        compile 'io.snappydata:snappy-spark-yarn_' + scalaBinaryVersion + ':' + snappySparkVersion
-        compile 'io.snappydata:snappy-spark-graphx_' + scalaBinaryVersion + ':' + snappySparkVersion
-        compile 'io.snappydata:snappy-spark-hive-thriftserver_' + scalaBinaryVersion + ':' + snappySparkVersion
-    }
-
-    if (new File(rootDir, 'store/build.gradle').exists()) {
-        testCompile project(':snappy-store:snappydata-store-client')
-        testCompile project(':snappy-store:snappydata-store-core')
-        testCompile project(':snappy-store:snappydata-store-tools')
-        testCompile project(':snappy-store:snappydata-store-tests')
-        testCompile project(':snappy-store:gemfire-tests')
-        testCompile project(':snappy-store:gemfire-core')
-        testCompile project(path: ':snappy-store:snappydata-store-tools', configuration: 'testOutput')
-    } else {
-        testCompile group: 'io.snappydata', name: 'snappydata-store-client', version: snappyStoreVersion
-        testCompile group: 'io.snappydata', name: 'snappydata-store-core', version: snappyStoreVersion
-        testCompile group: 'io.snappydata', name: 'snappydata-store-tools', version: snappyStoreVersion
-        testCompile group: 'io.snappydata', name: 'snappydata-store-hydra-tests', version: snappyStoreVersion
-        testCompile group: 'io.snappydata', name: 'gemfire-hydra-tests', version: snappyStoreVersion
-        testCompile group: 'io.snappydata', name: 'gemfire-core', version: snappyStoreVersion
-        testCompile group: 'io.snappydata', name: 'snappydata-store-tools', version: snappyStoreVersion, classifier: 'tests'
-    }
-    testRuntime project(':snappy-core_' + scalaBinaryVersion)
-    testCompile project(path: ':snappy-core_' + scalaBinaryVersion, configuration: 'testOutput')
-    testCompile project(path: ':snappy-cluster_' + scalaBinaryVersion, configuration: 'testOutput')
-    testCompile "org.scalatest:scalatest_${scalaBinaryVersion}:${scalatestVersion}"
-    testCompile project(':snappy-cluster_' + scalaBinaryVersion)
-    testRuntime project(':snappy-cluster_' + scalaBinaryVersion)
-    if (new File(rootDir, 'aqp/build.gradle').exists()) {
-        testRuntime project(':snappy-aqp_' + scalaBinaryVersion)
+  compile 'org.scala-lang:scala-library:' + scalaVersion
+  compile 'org.scala-lang:scala-reflect:' + scalaVersion
+
+  compile(project(':snappy-core_' + scalaBinaryVersion)) {
+    exclude(group: 'org.apache.spark', module: 'spark-unsafe_' + scalaBinaryVersion)
+    exclude(group: 'org.apache.spark', module: 'spark-core_' + scalaBinaryVersion)
+    exclude(group: 'org.apache.spark', module: 'spark-catalyst_' + scalaBinaryVersion)
+    exclude(group: 'org.apache.spark', module: 'spark-sql_' + scalaBinaryVersion)
+    exclude(group: 'org.apache.spark', module: 'spark-hive_' + scalaBinaryVersion)
+    exclude(group: 'org.apache.spark', module: 'spark-streaming_' + scalaBinaryVersion)
+    exclude(group: 'org.apache.spark', module: 'spark-streaming-kafka-0-10_' + scalaBinaryVersion)
+    exclude(group: 'org.apache.spark', module: 'spark-sql-kafka-0-10_' + scalaBinaryVersion)
+    exclude(group: 'org.apache.spark', module: 'spark-mllib_' + scalaBinaryVersion)
+    exclude(group: 'org.eclipse.jetty', module: 'jetty-servlet')
+  }
+  if (new File(rootDir, 'spark/build.gradle').exists()) {
+    testCompile(project(path: ':snappy-core_' + scalaBinaryVersion, configuration: 'testOutput')) {
+      exclude(group: 'org.apache.spark', module: 'spark-unsafe_' + scalaBinaryVersion)
+      exclude(group: 'org.apache.spark', module: 'spark-core_' + scalaBinaryVersion)
+      exclude(group: 'org.apache.spark', module: 'spark-catalyst_' + scalaBinaryVersion)
+      exclude(group: 'org.apache.spark', module: 'spark-sql_' + scalaBinaryVersion)
+      exclude(group: 'org.apache.spark', module: 'spark-hive_' + scalaBinaryVersion)
+      exclude(group: 'org.apache.spark', module: 'spark-streaming_' + scalaBinaryVersion)
+      exclude(group: 'org.apache.spark', module: 'spark-streaming-kafka-0-10_' + scalaBinaryVersion)
+      exclude(group: 'org.apache.spark', module: 'spark-sql-kafka-0-10_' + scalaBinaryVersion)
+      exclude(group: 'org.apache.spark', module: 'spark-mllib_' + scalaBinaryVersion)
+      exclude(group: 'org.eclipse.jetty', module: 'jetty-servlet')
     }
-    testCompile project(path: ':snappy-examples_' + scalaBinaryVersion, configuration: 'testOutput')
-    testRuntime project(':snappy-examples_' + scalaBinaryVersion)
-    testRuntime "org.pegdown:pegdown:${pegdownVersion}"
+    compile project(':snappy-spark:snappy-spark-repl_' + scalaBinaryVersion)
+    compile project(':snappy-spark:snappy-spark-yarn_' + scalaBinaryVersion)
+    compile project(':snappy-spark:snappy-spark-graphx_' + scalaBinaryVersion)
+    compile project(':snappy-spark:snappy-spark-hive-thriftserver_' + scalaBinaryVersion)
+  } else {
+    compile 'io.snappydata:snappy-spark-repl_' + scalaBinaryVersion + ':' + snappySparkVersion
+    compile 'io.snappydata:snappy-spark-yarn_' + scalaBinaryVersion + ':' + snappySparkVersion
+    compile 'io.snappydata:snappy-spark-graphx_' + scalaBinaryVersion + ':' + snappySparkVersion
+    compile 'io.snappydata:snappy-spark-hive-thriftserver_' + scalaBinaryVersion + ':' + snappySparkVersion
+  }
 
+  if (new File(rootDir, 'store/build.gradle').exists()) {
+    testCompile project(':snappy-store:snappydata-store-client')
+    testCompile project(':snappy-store:snappydata-store-core')
+    testCompile project(':snappy-store:snappydata-store-tools')
+    testCompile project(':snappy-store:snappydata-store-tests')
+    testCompile project(':snappy-store:gemfire-tests')
+    testCompile project(':snappy-store:gemfire-core')
+    testCompile project(path: ':snappy-store:snappydata-store-tools', configuration: 'testOutput')
+  } else {
+    testCompile group: 'io.snappydata', name: 'snappydata-store-client', version: snappyStoreVersion
+    testCompile group: 'io.snappydata', name: 'snappydata-store-core', version: snappyStoreVersion
+    testCompile group: 'io.snappydata', name: 'snappydata-store-tools', version: snappyStoreVersion
+    testCompile group: 'io.snappydata', name: 'snappydata-store-hydra-tests', version: snappyStoreVersion
+    testCompile group: 'io.snappydata', name: 'gemfire-hydra-tests', version: snappyStoreVersion
+    testCompile group: 'io.snappydata', name: 'gemfire-core', version: snappyStoreVersion
+    testCompile group: 'io.snappydata', name: 'snappydata-store-tools', version: snappyStoreVersion, classifier: 'tests'
+  }
+  testRuntime project(':snappy-core_' + scalaBinaryVersion)
+  testCompile project(path: ':snappy-core_' + scalaBinaryVersion, configuration: 'testOutput')
+  testCompile project(path: ':snappy-cluster_' + scalaBinaryVersion, configuration: 'testOutput')
+  testCompile "org.scalatest:scalatest_${scalaBinaryVersion}:${scalatestVersion}"
+  testCompile project(':snappy-cluster_' + scalaBinaryVersion)
+  testRuntime project(':snappy-cluster_' + scalaBinaryVersion)
+  if (new File(rootDir, 'aqp/build.gradle').exists()) {
+    testRuntime project(':snappy-aqp_' + scalaBinaryVersion)
+  }
+  testCompile project(path: ':snappy-examples_' + scalaBinaryVersion, configuration: 'testOutput')
+  testRuntime project(':snappy-examples_' + scalaBinaryVersion)
+  testRuntime "org.pegdown:pegdown:${pegdownVersion}"
 }
 
 task buildDtests {
@@ -118,42 +105,47 @@ task buildDtests {
 }
 
 task packageScalaDocs(type: Jar, dependsOn: scaladoc) {
-    classifier = 'javadoc'
-    from scaladoc
+  archiveClassifier.set('javadoc')
+  from scaladoc
 }
 
 artifacts {
   archives packageTests
 }
 if (rootProject.hasProperty('enablePublish')) {
-    artifacts {
-        archives packageScalaDocs, packageSources
-    }
+  artifacts {
+    archives packageScalaDocs, packageSources
+  }
 }
 
 archivesBaseName = 'snappydata-store-scala-tests'
 
 scalaTest {
-    dependsOn buildDtests
-    doFirst {
-        // cleanup files since scalatest plugin does not honour workingDir yet
-        cleanIntermediateFiles(project.path)
-        environment 'SMOKE_PERF': rootProject.hasProperty("smokePerf")
-    }
-    doLast {
-        // cleanup files since scalatest plugin does not honour workingDir yet
-        cleanIntermediateFiles(project.path)
-    }
+  dependsOn buildDtests
+
+  environment 'SNAPPY_HOME': snappyProductDir,
+      'APACHE_SPARK_HOME': sparkProductDir,
+      'APACHE_SPARK_CURRENT_HOME': sparkCurrentProductDir
+
+  doFirst {
+    // cleanup files since scalatest plugin does not honour workingDir yet
+    cleanIntermediateFiles(project.path)
+    environment 'SMOKE_PERF': rootProject.hasProperty("smokePerf")
+  }
+  doLast {
+    // cleanup files since scalatest plugin does not honour workingDir yet
+    cleanIntermediateFiles(project.path)
+  }
 }
 
 testClasses.doLast {
   if (new File(rootDir, 'store/build.gradle').exists()) {
     copy {
-      from ("src/test/java") {
-          include '**/*.bt'
-          include '**/*.conf'
-          include '**/*.inc'
-          include '**/*.sql'
+      from("src/test/java") {
+        include '**/*.bt'
+        include '**/*.conf'
+        include '**/*.inc'
+        include '**/*.sql'
       }
       into project(':snappy-store:snappydata-store-tests').sourceSets.main.java.outputDir
     }
diff --git a/dtests/src/test/java/io/snappydata/hydra/deployPkgUDF/SnappyDeployUnDeployTest.java b/dtests/src/test/java/io/snappydata/hydra/deployPkgUDF/SnappyDeployUnDeployTest.java
index 8e6980f7cd..c7cce1618b 100644
--- a/dtests/src/test/java/io/snappydata/hydra/deployPkgUDF/SnappyDeployUnDeployTest.java
+++ b/dtests/src/test/java/io/snappydata/hydra/deployPkgUDF/SnappyDeployUnDeployTest.java
@@ -75,7 +75,7 @@ public static void HydraTask_deployPkg() {
 
   public void deployPkg() {
 
-    String pkgName = "com.datastax.spark:spark-cassandra-connector_2.11:2.0.7";
+    String pkgName = "com.datastax.spark:spark-cassandra-connector_2.11:2.0.13";
     String pkgPath = SnappyPrms.getDataLocationList().get(0).toString();
     Connection conn = null;
     File pkgDir = new File(pkgPath);
@@ -93,7 +93,7 @@ public void deployPkg() {
   }
 
   public void deployJar() {
-    String jarName = "com.datastax.spark_spark-cassandra-connector_2.11-2.0.7.jar";
+    String jarName = "com.datastax.spark_spark-cassandra-connector_2.11-2.0.13.jar";
     String jarPath = SnappyPrms.getDataLocationList().get(0).toString() + "/" + jarName;
     Connection conn = null;
     try {
diff --git a/dtests/src/test/java/io/snappydata/hydra/deployPkgUDF/deployPkgUDF.bt b/dtests/src/test/java/io/snappydata/hydra/deployPkgUDF/deployPkgUDF.bt
index e3df43ac47..fc9fdd495b 100644
--- a/dtests/src/test/java/io/snappydata/hydra/deployPkgUDF/deployPkgUDF.bt
+++ b/dtests/src/test/java/io/snappydata/hydra/deployPkgUDF/deployPkgUDF.bt
@@ -49,7 +49,7 @@ io/snappydata/hydra/deployPkgUDF/deployPkgUDFPkg.conf
   A=snappyStore snappyStoreHosts=1 snappyStoreVMsPerHost=2 snappyStoreThreadsPerVM=2
   B=lead leadHosts=1 leadVMsPerHost=1 leadThreadsPerVM=2
   C=locator locatorHosts=1  locatorVMsPerHost=1 locatorThreadsPerVM=1
-  cassPath="/home/supriya/snappy/apache-cassandra-2.1.21"
+  cassPath="/home/supriya/snappy/apache-cassandra-2.1.22"
   pkgPath="$GEMFIRE/../../../dtests/src/resources/scripts/deployPkgUDF/deployedPkg"
   scriptPath="$GEMFIRE/../../../dtests/src/resources/scripts/deployPkgUDF/createCassandraTableAndLoadData"
 
diff --git a/dtests/src/test/scala/io/snappydata/hydra/SnappyHydraTestRunner.scala b/dtests/src/test/scala/io/snappydata/hydra/SnappyHydraTestRunner.scala
index d9580f1a14..baf7246be0 100644
--- a/dtests/src/test/scala/io/snappydata/hydra/SnappyHydraTestRunner.scala
+++ b/dtests/src/test/scala/io/snappydata/hydra/SnappyHydraTestRunner.scala
@@ -18,10 +18,10 @@ package io.snappydata.hydra
 
 import java.io.File
 
-import io.snappydata.SnappyTestRunner
 import scala.sys.process._
 
 import hydra.HostHelper
+import io.snappydata.SnappyTestRunner
 
 /**
  * Class extending can mix match methods like searchExceptions
@@ -31,11 +31,11 @@ class SnappyHydraTestRunner extends SnappyTestRunner {
   var SNAPPYDATA_SOURCE_DIR = ""
 
   override def beforeAll(): Unit = {
-    snappyHome = System.getenv("SNAPPY_HOME")
-    SNAPPYDATA_SOURCE_DIR = s"$snappyHome/../../.."
+    snappyHome = Option(System.getenv("SNAPPY_HOME")).getOrElse(System.getProperty("SNAPPY_HOME"))
     if (snappyHome == null) {
-      throw new Exception("SNAPPY_HOME should be set as an environment variable")
+      throw new Exception("SNAPPY_HOME should be set as an environment variable or system property")
     }
+    SNAPPYDATA_SOURCE_DIR = s"$snappyHome/../../.."
     currWorkingDir = System.getProperty("user.dir")
   }
 
diff --git a/dtests/src/test/scala/io/snappydata/hydra/SnappyTestUtils.scala b/dtests/src/test/scala/io/snappydata/hydra/SnappyTestUtils.scala
index a9693de565..b479207f03 100644
--- a/dtests/src/test/scala/io/snappydata/hydra/SnappyTestUtils.scala
+++ b/dtests/src/test/scala/io/snappydata/hydra/SnappyTestUtils.scala
@@ -18,11 +18,11 @@ package io.snappydata.hydra
 
 import java.io.{File, PrintWriter}
 
+import scala.io.{Codec, Source}
+
 import org.apache.spark.sql._
 import org.apache.spark.sql.catalyst.encoders.RowEncoder
 
-import scala.io.Source
-
 
 object SnappyTestUtils {
 
@@ -165,10 +165,12 @@ object SnappyTestUtils {
       writeToFile(sparkDF, sparkDest, snc)
       pw.println(s"${queryNum} Result Collected in file $sparkDest")
     }
-    val expectedFile = sparkFile.listFiles.filter(_.getName.endsWith(".csv"))
-    val actualFile = snappyFile.listFiles.filter(_.getName.endsWith(".csv"))
-    val expectedLineSet = Source.fromFile(expectedFile.iterator.next()).getLines()
-    val actualLineSet = Source.fromFile(actualFile.iterator.next()).getLines
+    val expectedFiles = sparkFile.listFiles.filter(_.getName.endsWith(".csv"))
+    val actualFiles = snappyFile.listFiles.filter(_.getName.endsWith(".csv"))
+    val expectedSources = expectedFiles.toIterator.map(Source.fromFile(_)(Codec.UTF8))
+    val actualSources = actualFiles.toIterator.map(Source.fromFile(_)(Codec.UTF8))
+    val expectedLineSet = expectedSources.flatMap(_.getLines())
+    val actualLineSet = actualSources.flatMap(_.getLines())
     // var numLines = 0
     while (expectedLineSet.hasNext && actualLineSet.hasNext) {
       val expectedLine = expectedLineSet.next()
@@ -193,8 +195,11 @@ object SnappyTestUtils {
       pw.flush()
       // assert(assertion = false, s"\nFor $queryNum result count mismatch observed")
     }
-    // scalastyle:on println
     pw.flush()
+    // scalastyle:off println
+
+    expectedSources.foreach(_.close())
+    actualSources.foreach(_.close())
   }
 
   def assertQueryFullResultSet(snc: SnappyContext, snDF : DataFrame,
@@ -224,10 +229,12 @@ object SnappyTestUtils {
       writeToFile(sparkDF, sparkDest, snc)
       pw.println(s"${queryNum} Result Collected in file $sparkDest")
     }
-    val expectedFile = sparkFile.listFiles.filter(_.getName.endsWith(".csv"))
-    val actualFile = snappyFile.listFiles.filter(_.getName.endsWith(".csv"))
-    val expectedLineSet = Source.fromFile(expectedFile.iterator.next()).getLines()
-    val actualLineSet = Source.fromFile(actualFile.iterator.next()).getLines
+    val expectedFiles = sparkFile.listFiles.filter(_.getName.endsWith(".csv"))
+    val actualFiles = snappyFile.listFiles.filter(_.getName.endsWith(".csv"))
+    val expectedSources = expectedFiles.toIterator.map(Source.fromFile(_)(Codec.UTF8))
+    val actualSources = actualFiles.toIterator.map(Source.fromFile(_)(Codec.UTF8))
+    val expectedLineSet = expectedSources.flatMap(_.getLines())
+    val actualLineSet = actualSources.flatMap(_.getLines())
     while (expectedLineSet.hasNext && actualLineSet.hasNext) {
       val expectedLine = expectedLineSet.next()
       val actualLine = actualLineSet.next()
@@ -248,11 +255,15 @@ object SnappyTestUtils {
     pw.println()
     // scalastyle:on println
     pw.flush()
+
+    expectedSources.foreach(_.close())
+    actualSources.foreach(_.close())
   }
 
   def assertQueryFullResultSet(snc: SnappyContext, snDF : DataFrame,
                                spDF : DataFrame, queryNum: String,
-                               tableType: String, pw: PrintWriter, sqlContext: SQLContext, isJoin : Boolean ): Any = {
+                               tableType: String, pw: PrintWriter,
+                               sqlContext: SQLContext, isJoin : Boolean ): Any = {
     var snappyDF: DataFrame = snDF
     var sparkDF = spDF
     val snappyQueryFileName = s"Snappy_${queryNum}.out"
@@ -287,10 +298,12 @@ object SnappyTestUtils {
       writeToFile(sparkDF, sparkDest, snc)
       pw.println(s"${queryNum} Result Collected in file $sparkDest")
     }
-    val expectedFile = sparkFile.listFiles.filter(_.getName.endsWith(".csv"))
-    val actualFile = snappyFile.listFiles.filter(_.getName.endsWith(".csv"))
-    val expectedLineSet = Source.fromFile(expectedFile.iterator.next()).getLines()
-    val actualLineSet = Source.fromFile(actualFile.iterator.next()).getLines
+    val expectedFiles = sparkFile.listFiles.filter(_.getName.endsWith(".csv"))
+    val actualFiles = snappyFile.listFiles.filter(_.getName.endsWith(".csv"))
+    val expectedSources = expectedFiles.toIterator.map(Source.fromFile(_)(Codec.UTF8))
+    val actualSources = actualFiles.toIterator.map(Source.fromFile(_)(Codec.UTF8))
+    val expectedLineSet = expectedSources.flatMap(_.getLines())
+    val actualLineSet = actualSources.flatMap(_.getLines())
     while (expectedLineSet.hasNext && actualLineSet.hasNext) {
       val expectedLine = expectedLineSet.next()
       val actualLine = actualLineSet.next()
@@ -310,5 +323,8 @@ object SnappyTestUtils {
     pw.println()
     // scalastyle:on println
     pw.flush()
+
+    expectedSources.foreach(_.close())
+    actualSources.foreach(_.close())
   }
 }
diff --git a/dtests/src/test/scala/io/snappydata/hydra/northwind/NWTestUtil.scala b/dtests/src/test/scala/io/snappydata/hydra/northwind/NWTestUtil.scala
index f7b1d44954..27a5859211 100644
--- a/dtests/src/test/scala/io/snappydata/hydra/northwind/NWTestUtil.scala
+++ b/dtests/src/test/scala/io/snappydata/hydra/northwind/NWTestUtil.scala
@@ -17,8 +17,9 @@
 package io.snappydata.hydra.northwind
 
 import java.io.{File, PrintWriter}
+
 import io.snappydata.hydra.SnappyTestUtils
-import scala.io.Source
+import scala.io.{Codec, Source}
 
 import org.apache.spark.sql.catalyst.encoders.RowEncoder
 import org.apache.spark.sql._
@@ -144,10 +145,12 @@ object NWTestUtil {
       writeToFile(sparkDF, sparkDest, snc)
       pw.println(s"${queryNum} Result Collected in file $sparkDest")
     }
-    val expectedFile = sparkFile.listFiles.filter(_.getName.endsWith(".csv"))
-    val actualFile = snappyFile.listFiles.filter(_.getName.endsWith(".csv"))
-    val expectedLineSet = Source.fromFile(expectedFile.iterator.next()).getLines()
-    val actualLineSet = Source.fromFile(actualFile.iterator.next()).getLines
+    val expectedFiles = sparkFile.listFiles.filter(_.getName.endsWith(".csv"))
+    val actualFiles = snappyFile.listFiles.filter(_.getName.endsWith(".csv"))
+    val expectedSources = expectedFiles.toIterator.map(Source.fromFile(_)(Codec.UTF8))
+    val actualSources = actualFiles.toIterator.map(Source.fromFile(_)(Codec.UTF8))
+    val expectedLineSet = expectedSources.flatMap(_.getLines())
+    val actualLineSet = actualSources.flatMap(_.getLines())
     var numLines = 0
     while (expectedLineSet.hasNext && actualLineSet.hasNext) {
       val expectedLine = expectedLineSet.next()
@@ -174,6 +177,9 @@ object NWTestUtil {
         s"observed: Expected=$numRows, Got=$numLines")
     pw.flush()
     // scalastyle:on println
+
+    expectedSources.foreach(_.close())
+    actualSources.foreach(_.close())
   }
 
   def createAndLoadReplicatedTables(snc: SnappyContext): Unit = {
diff --git a/dunit/src/main/java/io/snappydata/test/dunit/DistributedTestBase.java b/dunit/src/main/java/io/snappydata/test/dunit/DistributedTestBase.java
index 9c30e6d4b5..3d75e27aeb 100755
--- a/dunit/src/main/java/io/snappydata/test/dunit/DistributedTestBase.java
+++ b/dunit/src/main/java/io/snappydata/test/dunit/DistributedTestBase.java
@@ -133,6 +133,10 @@ public static String getBaseDir() {
     }
   }
 
+  static {
+    InitializeRun.setUp();
+  }
+
   ///////////////////////  Utility Methods  ///////////////////////
 
   /**
diff --git a/dunit/src/main/java/io/snappydata/test/dunit/standalone/DUnitLauncher.java b/dunit/src/main/java/io/snappydata/test/dunit/standalone/DUnitLauncher.java
index 78327b3f81..81906b8303 100644
--- a/dunit/src/main/java/io/snappydata/test/dunit/standalone/DUnitLauncher.java
+++ b/dunit/src/main/java/io/snappydata/test/dunit/standalone/DUnitLauncher.java
@@ -135,6 +135,7 @@ private static boolean isHydra() {
       return false;
     }
   }
+
   /**
    * Launch DUnit. If the unit test was launched through
    * the hydra framework, leave the test alone.
@@ -145,7 +146,7 @@ public static void launchIfNeeded() {
       return;
     }
 
-    if(!isHydra() &&!isLaunched()) {
+    if (!isHydra() && !isLaunched()) {
       try {
         launch();
       } catch (Exception e) {
diff --git a/examples/src/test/scala/io/snappydata/SnappyTestRunner.scala b/examples/src/test/scala/io/snappydata/SnappyTestRunner.scala
index fd237f65a9..b5ec721491 100644
--- a/examples/src/test/scala/io/snappydata/SnappyTestRunner.scala
+++ b/examples/src/test/scala/io/snappydata/SnappyTestRunner.scala
@@ -25,10 +25,12 @@ import java.util.regex.Pattern
 import scala.language.postfixOps
 import scala.sys.process._
 import scala.util.parsing.json.JSON
+
 import com.gemstone.gemfire.internal.AvailablePort
 import org.apache.commons.io.FileUtils
 import org.apache.commons.io.output.TeeOutputStream
 import org.scalatest.{BeforeAndAfterAll, FunSuite, Retries}
+
 import org.apache.spark.Logging
 import org.apache.spark.sql.collection.Utils
 
@@ -73,9 +75,9 @@ with Logging with Retries {
   }
 
   override def beforeAll(): Unit = {
-    snappyHome = System.getenv("SNAPPY_HOME")
+    snappyHome = Option(System.getenv("SNAPPY_HOME")).getOrElse(System.getProperty("SNAPPY_HOME"))
     if (snappyHome == null) {
-      throw new Exception("SNAPPY_HOME should be set as an environment variable")
+      throw new Exception("SNAPPY_HOME should be set as an environment variable or system property")
     }
     localHostName = "localhost"
     currWorkingDir = System.getProperty("user.dir")
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 457aad0d98108420a977756b7145c93c8910b076..5c2d1cf016b3885f6930543d57b744ea8c220a1a 100644
GIT binary patch
delta 19567
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

delta 19692
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
PFlPAY0appj7IgMMQM_1|

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ee671127ff..0ebb3108e2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 1f2758297d..e8caf71c6f 100755
--- a/gradlew
+++ b/gradlew
@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -109,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
diff --git a/gradlew.bat b/gradlew.bat
index 6c62aa5fc7..685a4b7f8e 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
diff --git a/jdbc/src/main/scala/org/apache/spark/sql/SnappyDataPoolDialect.scala b/jdbc/src/main/scala/org/apache/spark/sql/SnappyDataPoolDialect.scala
index 1e4234574d..0b1fd2961a 100644
--- a/jdbc/src/main/scala/org/apache/spark/sql/SnappyDataPoolDialect.scala
+++ b/jdbc/src/main/scala/org/apache/spark/sql/SnappyDataPoolDialect.scala
@@ -43,8 +43,9 @@ case object SnappyDataPoolDialect extends SnappyDataBaseDialect with Logging {
 
   private val URL_PATTERN = Pattern.compile("^" + Constant.POOLED_THIN_CLIENT_URL,
     Pattern.CASE_INSENSITIVE)
+  private val COMPLEX_TYPE_AS_JSON_HINT = s"${Constant.COMPLEX_TYPE_AS_JSON_HINT}\\s*\\(([^)]*)\\)"
   private val COMPLEX_TYPE_AS_JSON_HINT_PATTERN = Pattern.compile(
-    s"${Constant.COMPLEX_TYPE_AS_JSON_HINT}\\s*\\(([^)]*)\\)", Pattern.CASE_INSENSITIVE)
+    COMPLEX_TYPE_AS_JSON_HINT, Pattern.CASE_INSENSITIVE)
 
   def register(): Unit = {
     // no-op, all registration is done in the object constructor
@@ -83,10 +84,12 @@ case object SnappyDataPoolDialect extends SnappyDataBaseDialect with Logging {
                 // releases where LocalRelation class primary constructor has changed signature
                 cons.newInstance(tableName, LocalRelation.apply(output: _*), None)
               } catch {
-                case _: Exception => // fallback to two argument constructor
-                  val cons = classOf[SubqueryAlias].getConstructor(classOf[String],
-                    classOf[LogicalPlan])
-                  cons.newInstance(tableName, LocalRelation.apply(output: _*))
+                case _: Exception => // fallback to two argument apply that works for both 2.3/2.4
+                  // class of companion class which is SubqueryAlias$ in bytecode
+                  val c = SubqueryAlias.getClass
+                  val m = c.getMethod("apply", classOf[String], classOf[LogicalPlan])
+                  m.invoke(c.getField("MODULE$").get(null),
+                    tableName, LocalRelation.apply(output: _*)).asInstanceOf[SubqueryAlias]
               }
             }
         }
diff --git a/launcher/src/main/java/io/snappydata/tools/QuickLauncher.java b/launcher/src/main/java/io/snappydata/tools/QuickLauncher.java
index 0f129b54a9..64bb8ffde4 100644
--- a/launcher/src/main/java/io/snappydata/tools/QuickLauncher.java
+++ b/launcher/src/main/java/io/snappydata/tools/QuickLauncher.java
@@ -28,7 +28,6 @@
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Properties;
-import java.util.regex.Pattern;
 
 import com.gemstone.gemfire.internal.cache.Status;
 import com.gemstone.gemfire.internal.shared.ClientSharedUtils;
@@ -215,6 +214,8 @@ private int start(final String[] args) throws IOException, InterruptedException
     }
 
     // finally launch the main process
+    assert startLogFileName != null;
+    assert pidFileName != null;
     final Path startLogFile = this.workingDir.resolve(startLogFileName);
     final Path pidFile = this.workingDir.resolve(pidFileName);
     Files.deleteIfExists(startLogFile);
@@ -268,14 +269,16 @@ private int stop(final String[] args) throws IOException {
 
     // determine the current state of the node
     readStatus(false, statusFile);
-    if (this.status != null) {
+    Status status = this.status;
+    if (status != null) {
       // upon reading the status file, request the Cache Server to shutdown
       // if it has not already...
-      if (this.status.state != Status.SHUTDOWN) {
+      if (status.state != Status.SHUTDOWN) {
         // copy server PID and not use own PID; see bug #39707
-        this.status = Status.create(this.baseName, Status.SHUTDOWN_PENDING,
-            this.status.pid, statusFile);
-        this.status.write();
+        status = Status.create(this.baseName, Status.SHUTDOWN_PENDING,
+            status.pid, statusFile);
+        status.write();
+        this.status = status;
       }
 
       // poll the Cache Server for a response to our shutdown request
diff --git a/mkdocs.yml b/mkdocs.yml
index a2b29625a4..3886df8388 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1,5 +1,5 @@
 site_name: SnappyData™ 1.3.0
-site_url: http://www.snappydata.io
+site_url: https://github.com/TIBCOSoftware/snappydata
 site_description: Project documentation for SnappyData
 site_author: SnappyData Team
 site_favicon: favicon.ico
diff --git a/release/filehdr-mod.txt b/release/filehdr-mod.txt
index 45fdd561b5..7addbdd67c 100644
--- a/release/filehdr-mod.txt
+++ b/release/filehdr-mod.txt
@@ -1,7 +1,7 @@
 /*
  * Changes for TIBCO Project SnappyData data platform.
  *
- * Portions Copyright (c) 2017-2019 TIBCO Software Inc. All rights reserved.
+ * Portions Copyright (c) 2017-2021 TIBCO Software Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you
  * may not use this file except in compliance with the License. You
diff --git a/release/filehdr.txt b/release/filehdr.txt
index 0dcbd010ff..842fa768e8 100644
--- a/release/filehdr.txt
+++ b/release/filehdr.txt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019 TIBCO Software Inc. All rights reserved.
+ * Copyright (c) 2017-2021 TIBCO Software Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you
  * may not use this file except in compliance with the License. You
diff --git a/release/preInstallDeb.sh b/release/preInstallDeb.sh
index 54e1471608..06eed6feb3 100755
--- a/release/preInstallDeb.sh
+++ b/release/preInstallDeb.sh
@@ -11,5 +11,5 @@ if ! getent group $SNAPPY_GROUP > /dev/null; then
 fi
 if ! getent passwd $SNAPPY_USER > /dev/null; then
   adduser --system $quiet --home $SNAPPY_HOME --no-create-home --shell /bin/bash \
-      --ingroup $SNAPPY_GROUP --gecos "TIBCO ComputeDB cluster owner" $SNAPPY_USER
+      --ingroup $SNAPPY_GROUP --gecos "SnappyData cluster owner" $SNAPPY_USER
 fi
diff --git a/release/preInstallRpm.sh b/release/preInstallRpm.sh
index 42205c03ff..51cfa275c8 100755
--- a/release/preInstallRpm.sh
+++ b/release/preInstallRpm.sh
@@ -9,5 +9,5 @@ if ! getent group $SNAPPY_GROUP > /dev/null; then
 fi
 if ! getent passwd $SNAPPY_USER > /dev/null; then
   useradd -r -M -d $SNAPPY_HOME -s /bin/bash -N -g $SNAPPY_GROUP \
-      -c "TIBCO ComputeDB cluster owner" $SNAPPY_USER
+      -c "SnappyData cluster owner" $SNAPPY_USER
 fi
diff --git a/release/replace-txt.sh b/release/replace-txt.sh
index 62fbf833a0..e19715d731 100755
--- a/release/replace-txt.sh
+++ b/release/replace-txt.sh
@@ -1,8 +1,13 @@
 #!/usr/bin/env bash
 
-usage="Usage: replace-txt.sh < -d|--dir srcfolder > < -t|--text text > < -r|--replace replacement text > [ -e|--extension file_extension ]"
+file_extensions=".scala .java .sh .gradle .h .cpp .py .xml .thrift .tmpl .properties"
 
-file_extensions=(.scala .java .sh .gradle .h .cpp .py .xml .thrift .tmpl .properties)
+usage() {
+  echo "Usage: replace-txt.sh < -d|--dir srcfolder > < -t|--text perl regex (multiline matching) > < -r|--replace replacement text|-f|--replace-file replacement text from file > [ -e|--extension file_extensions ]"
+  echo
+  echo "For example to update license headers: replace-text.sh -d <dir> -t '\/\*.*?\* Copyright [^ ]* 20..-20.. TIBCO Software Inc. All rights reserved..*?\*\/' -f filehdr.txt"
+  echo
+}
 
 while [[ $# > 1 ]]
 do
@@ -10,10 +15,7 @@ key="$1"
 
 case $key in
   -e|--extension)
-  EXTENSION="$2"
-  if [ $EXTENSION != ".scala" -a $EXTENSION != ".java" ]; then
-    file_extensions+=($EXTENSION)
-  fi
+  file_extensions="$2"
   shift # past argument
   ;;
   -d|--dir)
@@ -28,44 +30,56 @@ case $key in
   REPLACE_TEXT="$2"
   shift # past argument
   ;;
+  -f|--replace-file)
+  REPLACE_TEXT="`cat "$2" | sed 's,/,\\\/,g'`"
+  shift # past argument
+  ;;
   *)
   # unknown option
-  echo $usage
+  usage
   exit 1
   ;;
 esac
 shift # past argument or value
 done
 
-if [ ! -d ${SOURCEPATH} ]; then
+if [ -z "${TEXT}" ]; then
+  echo Text to be replaced is empty
+  echo
+  usage
+  exit 1
+fi
+
+if [ ! -d "${SOURCEPATH}" ]; then
   echo Directory ${SOURCEPATH} does not exists
+  echo
+  usage
   exit 1
 fi
 
-echo FILE EXTENSION  = "${file_extensions[@]}"
+echo FILE EXTENSIONS  = "$file_extensions"
 echo SOURCE PATH     = "${SOURCEPATH}"
 
 red='\e[0;31m'
 bluebg='\e[0;44m'
 NC='\e[0m' # No Color
 
-for ext in "${file_extensions[@]}"
+for ext in $file_extensions
 do
   echo
   echo EXTENSION = ${ext}
   echo "---------------------------------------"
-  sleep 5
   for f in `find ${SOURCEPATH} -name "*${ext}"`
   do
-    TEXT_EXISTS=`grep -n "${TEXT}" ${f}`
+    #TEXT_EXISTS=`grep -n "${TEXT}" ${f}`
     #echo SNAPPY_PATTERN = ${SNAPPY_PATTERN}
     #echo SNAPPY_HDR_EXISTS= ${SNAPPY_HDR_EXISTS}
-    if [ ! -z "${TEXT_EXISTS}" ]; then
+    #if [ ! -z "${TEXT_EXISTS}" ]; then
       echo -e "${bluebg}Replacing text in file ${f} ${NC}"
-      sed -i -e "s/${TEXT}/${REPLACE_TEXT}/" ${f}
-    else 
-      echo -e "${red}Text to be replaced does not exists in file ${f}"
-    fi
+      perl -pi -e "BEGIN{undef $/;} s/${TEXT}/${REPLACE_TEXT}/smg" "$f"
+    #else
+    #  echo -e "${red}Text to be replaced does not exists in file ${f}"
+    #fi
   done
 done
 echo
diff --git a/scalastyle-config.xml b/scalastyle-config.xml
index 837532be37..50db4f4565 100644
--- a/scalastyle-config.xml
+++ b/scalastyle-config.xml
@@ -49,7 +49,7 @@ This file is divided into 3 sections:
   <check level="error" class="org.scalastyle.file.HeaderMatchesChecker" enabled="true">
     <parameters>
        <parameter name="header"><![CDATA[/*
- * Copyright (c) 2017-2019 TIBCO Software Inc. All rights reserved.
+ * Copyright (c) 2017-2021 TIBCO Software Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you
  * may not use this file except in compliance with the License. You
diff --git a/snappy-connectors b/snappy-connectors
new file mode 160000
index 0000000000..8b1f0dcd4d
--- /dev/null
+++ b/snappy-connectors
@@ -0,0 +1 @@
+Subproject commit 8b1f0dcd4d4e7702958146b9ab972805371b6406
diff --git a/spark b/spark
index bbc94e1be3..552203b5be 160000
--- a/spark
+++ b/spark
@@ -1 +1 @@
-Subproject commit bbc94e1be32a5e37ba1f2b173309a3e63da1c955
+Subproject commit 552203b5becb1470cb215980a1b63e39c3af82e7
diff --git a/spark-jobserver b/spark-jobserver
index e790413506..913de7fc2e 160000
--- a/spark-jobserver
+++ b/spark-jobserver
@@ -1 +1 @@
-Subproject commit e790413506d0a094dc48a29a1657019cf1334dc9
+Subproject commit 913de7fc2efa9ebadfb93efc83353865f681e3de
diff --git a/store b/store
index d1898c67e5..25ddfefb96 160000
--- a/store
+++ b/store
@@ -1 +1 @@
-Subproject commit d1898c67e5e98c6e495dc25a481b82f16b76762f
+Subproject commit 25ddfefb963cf8c83b6fc16a1c1cbed9f9368134