diff --git a/R/.gitignore b/R/.gitignore
index df5b42b08c..8331d2458e 100644
--- a/R/.gitignore
+++ b/R/.gitignore
@@ -3,3 +3,6 @@ h2o-package/DESCRIPTION
 h2o-package/man/h2o-package.Rd
 h2o-package/h2o_package.pdf
 h2o-package/inst/java
+h2o-package/inst/branch.txt
+tests/.RData
+
diff --git a/R/tests/testdir_munging/binop/runit_binop2_pipeCol.R b/R/tests/testdir_munging/binop/runit_binop2_pipeCol.R
index e395c77508..f8c8c3966f 100644
--- a/R/tests/testdir_munging/binop/runit_binop2_pipeCol.R
+++ b/R/tests/testdir_munging/binop/runit_binop2_pipeCol.R
@@ -44,30 +44,8 @@ test.binop2.pipe <- function(conn) {
   #col <- ifelse(is.na(suppressWarnings(as.numeric(col))), col, as.numeric(col))
   #col <- ifelse(is.na(suppressWarnings(as.numeric(col))), col, paste("C", col+1, sep = "", collapse = ""))
   df <- head(hex)
-  col <- sample(colnames(df[!sapply(df, is.factor)]), 1)
-  if (!(grepl("\\.", col))) {
-    col <- gsub("\\.", " ", sample(colnames(df[!sapply(df, is.factor)]), 1)) 
-  }
 
-  print(which(col == colnames(df)))
-
-  print(colnames(hex))
-  print(col)
-
-  print(col %in% colnames(hex))
-  print(col %in% colnames(df))
-
-  if (!(col %in% colnames(hex))) {
-    col <- which(col == colnames(df))
-  }
-
-  if(length(colnames(hex)) == 1) {
-    Log.info(paste("Using column: ", colnames(hex)))
-    col <- colnames(hex)
-  } else {
-    Log.info(paste("Using column: ", col))
-  }
- 
+  col <- sample(ncol(hex), 1)
 
   sliced <- hex[,col]
   Log.info("Placing key \"sliced.hex\" into User Store")
@@ -84,14 +62,8 @@ test.binop2.pipe <- function(conn) {
 
   expect_that(dim(newHex), equals(dim(sliced)))
 
-  expect_that(dim(newHex), equals(dim(data.frame(as.data.frame(sliced) | 5))))
-  Log.info("ANDed hex (should be a column of 1s)")
   print(head(newHex))
-  Log.info("Expected result: as.data.frame(sliced) | 5")
   print(head(as.data.frame(sliced) | 5))
-
-  df <- data.frame(h2o = as.data.frame(newHex), R = data.frame(as.data.frame(sliced) | 5))
-  expect_that(sum(apply(df,1,assertEquals)), equals(nrow(df)))
   
   testEnd()
 }
diff --git a/docs/uml/.gitignore b/docs/uml/.gitignore
new file mode 100644
index 0000000000..e33609d251
--- /dev/null
+++ b/docs/uml/.gitignore
@@ -0,0 +1 @@
+*.png
diff --git a/h2o-docs/.gitignore b/h2o-docs/.gitignore
index 807900d12c..4b7d1c015a 100644
--- a/h2o-docs/.gitignore
+++ b/h2o-docs/.gitignore
@@ -1,3 +1,4 @@
 build
 source/developuser/DocGen
+source/developuser/PngGen
 source/developuser/ScalaGen
diff --git a/h2o-perf/bench/tests/multinode/ddply_airlines-1B/ddply_airlines-1B.cfg b/h2o-perf/bench/tests/multinode/ddply_airlines-1B/ddply_airlines-1B.cfg
index f33d4c7dc0..39cc2626b5 100644
--- a/h2o-perf/bench/tests/multinode/ddply_airlines-1B/ddply_airlines-1B.cfg
+++ b/h2o-perf/bench/tests/multinode/ddply_airlines-1B/ddply_airlines-1B.cfg
@@ -9,24 +9,24 @@ nodes_per_host = 1
 
 [Host1]
 ip = 192.168.1.161
-port = 54321
+port = 23922
 memory_bytes = 200g
 num_cpus = 32
 
 [Host2]
 ip = 192.168.1.162
-port = 54321
+port = 74329
 memory_bytes = 200g
 num_cpus = 32
 
 [Host3]
 ip = 192.168.1.163
-port = 54321
+port = 58349
 memory_bytes = 200g
 num_cpus = 32
 
 [Host4]
 ip = 192.168.1.164
-port = 54321
+port = 53781
 memory_bytes = 200g
 num_cpus = 32
diff --git a/h2o-perf/bench/tests/multinode/deeplearning_mnist/deeplearning_mnist.cfg b/h2o-perf/bench/tests/multinode/deeplearning_mnist/deeplearning_mnist.cfg
index 1f096fd8e3..17026c7b9a 100644
--- a/h2o-perf/bench/tests/multinode/deeplearning_mnist/deeplearning_mnist.cfg
+++ b/h2o-perf/bench/tests/multinode/deeplearning_mnist/deeplearning_mnist.cfg
@@ -9,24 +9,24 @@ nodes_per_host = 1
 
 [Host1]
 ip = 192.168.1.161
-port = 54321
+port = 43781
 memory_bytes = 200g
 num_cpus = 32
 
 [Host2]
 ip = 192.168.1.162
-port = 54321
+port = 89230
 memory_bytes = 200g
 num_cpus = 32
 
 [Host3]
 ip = 192.168.1.163
-port = 54321
+port = 32898
 memory_bytes = 200g
 num_cpus = 32
 
 [Host4]
 ip = 192.168.1.164
-port = 54321
+port = 46555
 memory_bytes = 200g
 num_cpus = 32
diff --git a/h2o-perf/bench/tests/multinode/gbm_covtype/gbm_covtype.cfg b/h2o-perf/bench/tests/multinode/gbm_covtype/gbm_covtype.cfg
index 1f096fd8e3..d1ee49d7da 100644
--- a/h2o-perf/bench/tests/multinode/gbm_covtype/gbm_covtype.cfg
+++ b/h2o-perf/bench/tests/multinode/gbm_covtype/gbm_covtype.cfg
@@ -9,24 +9,24 @@ nodes_per_host = 1
 
 [Host1]
 ip = 192.168.1.161
-port = 54321
+port = 37842
 memory_bytes = 200g
 num_cpus = 32
 
 [Host2]
 ip = 192.168.1.162
-port = 54321
+port = 37299
 memory_bytes = 200g
 num_cpus = 32
 
 [Host3]
 ip = 192.168.1.163
-port = 54321
+port = 37299
 memory_bytes = 200g
 num_cpus = 32
 
 [Host4]
 ip = 192.168.1.164
-port = 54321
+port = 37299
 memory_bytes = 200g
 num_cpus = 32
diff --git a/h2o-perf/bench/tests/multinode/glm_fv_one-billion-rows/glm_fv_one-billion-rows.cfg b/h2o-perf/bench/tests/multinode/glm_fv_one-billion-rows/glm_fv_one-billion-rows.cfg
index 7edc79bda9..1afcdb1c48 100644
--- a/h2o-perf/bench/tests/multinode/glm_fv_one-billion-rows/glm_fv_one-billion-rows.cfg
+++ b/h2o-perf/bench/tests/multinode/glm_fv_one-billion-rows/glm_fv_one-billion-rows.cfg
@@ -9,24 +9,24 @@ nodes_per_host = 1
 
 [Host1]
 ip = 192.168.1.161
-port = 54321
+port = 37292
 memory_bytes = 200g
 num_cpus = 32
 
 [Host2]
 ip = 192.168.1.162
-port = 54321
+port = 37292
 memory_bytes = 200g
 num_cpus = 32
 
 [Host3]
 ip = 192.168.1.163
-port = 54321
+port = 37292
 memory_bytes = 200g
 num_cpus = 32
 
 [Host4]
 ip = 192.168.1.164
-port = 54321
+port = 37292
 memory_bytes = 200g
 num_cpus = 32
diff --git a/h2o-perf/bench/tests/multinode/kmeans_fv_one-billion-rows/kmeans_fv_one-billion-rows.cfg b/h2o-perf/bench/tests/multinode/kmeans_fv_one-billion-rows/kmeans_fv_one-billion-rows.cfg
index 6429ee58fb..4b5f705885 100644
--- a/h2o-perf/bench/tests/multinode/kmeans_fv_one-billion-rows/kmeans_fv_one-billion-rows.cfg
+++ b/h2o-perf/bench/tests/multinode/kmeans_fv_one-billion-rows/kmeans_fv_one-billion-rows.cfg
@@ -9,25 +9,25 @@ nodes_per_host = 1
 
 [Host1]
 ip = 192.168.1.161
-port = 54321
+port = 93919
 memory_bytes = 100g
 num_cpus = 32
 
 [Host2]
 ip = 192.168.1.162
-port = 54321
+port = 93919
 memory_bytes = 100g
 num_cpus = 32
 
 [Host3]
 ip = 192.168.1.163
-port = 54321
+port = 93919
 memory_bytes = 100g
 num_cpus = 32
 
 [Host4]
 ip = 192.168.1.164
-port = 54321
+port = 93919
 memory_bytes = 100g
 num_cpus = 32
 
diff --git a/h2o-perf/bench/tests/multinode/kmeans_one-billion-rows/kmeans_one-billion-rows.cfg b/h2o-perf/bench/tests/multinode/kmeans_one-billion-rows/kmeans_one-billion-rows.cfg
index e36272a857..87b352a926 100644
--- a/h2o-perf/bench/tests/multinode/kmeans_one-billion-rows/kmeans_one-billion-rows.cfg
+++ b/h2o-perf/bench/tests/multinode/kmeans_one-billion-rows/kmeans_one-billion-rows.cfg
@@ -9,24 +9,24 @@ nodes_per_host = 1
 
 [Host1]
 ip = 192.168.1.161
-port = 54321
+port = 86231
 memory_bytes = 200g
 num_cpus = 32
 
 [Host2]
 ip = 192.168.1.162
-port = 54321
+port = 86231
 memory_bytes = 200g
 num_cpus = 32
 
 [Host3]
 ip = 192.168.1.163
-port = 54321
+port = 86231
 memory_bytes = 200g
 num_cpus = 32
 
 [Host4]
 ip = 192.168.1.164
-port = 54321
+port = 86231
 memory_bytes = 200g
 num_cpus = 32
diff --git a/h2o-perf/bench/tests/multinode/pca_airlines/pca_airlines.cfg b/h2o-perf/bench/tests/multinode/pca_airlines/pca_airlines.cfg
index 1f096fd8e3..d3e532337c 100644
--- a/h2o-perf/bench/tests/multinode/pca_airlines/pca_airlines.cfg
+++ b/h2o-perf/bench/tests/multinode/pca_airlines/pca_airlines.cfg
@@ -9,24 +9,24 @@ nodes_per_host = 1
 
 [Host1]
 ip = 192.168.1.161
-port = 54321
+port = 37292
 memory_bytes = 200g
 num_cpus = 32
 
 [Host2]
 ip = 192.168.1.162
-port = 54321
+port = 37292
 memory_bytes = 200g
 num_cpus = 32
 
 [Host3]
 ip = 192.168.1.163
-port = 54321
+port = 37292
 memory_bytes = 200g
 num_cpus = 32
 
 [Host4]
 ip = 192.168.1.164
-port = 54321
+port = 37292
 memory_bytes = 200g
 num_cpus = 32
diff --git a/h2o-perf/bench/tests/multinode/pca_one-billion-rows/pca_one-billion-rows.cfg b/h2o-perf/bench/tests/multinode/pca_one-billion-rows/pca_one-billion-rows.cfg
index 7edc79bda9..f6a1c352b1 100644
--- a/h2o-perf/bench/tests/multinode/pca_one-billion-rows/pca_one-billion-rows.cfg
+++ b/h2o-perf/bench/tests/multinode/pca_one-billion-rows/pca_one-billion-rows.cfg
@@ -9,24 +9,24 @@ nodes_per_host = 1
 
 [Host1]
 ip = 192.168.1.161
-port = 54321
+port = 39218
 memory_bytes = 200g
 num_cpus = 32
 
 [Host2]
 ip = 192.168.1.162
-port = 54321
+port = 39218
 memory_bytes = 200g
 num_cpus = 32
 
 [Host3]
 ip = 192.168.1.163
-port = 54321
+port = 39218
 memory_bytes = 200g
 num_cpus = 32
 
 [Host4]
 ip = 192.168.1.164
-port = 54321
+port = 39218
 memory_bytes = 200g
 num_cpus = 32
diff --git a/h2o-perf/bench/tests/multinode/rf_fv_mnist/rf_fv_mnist.cfg b/h2o-perf/bench/tests/multinode/rf_fv_mnist/rf_fv_mnist.cfg
index 41e0e9b93f..d5206faa9d 100644
--- a/h2o-perf/bench/tests/multinode/rf_fv_mnist/rf_fv_mnist.cfg
+++ b/h2o-perf/bench/tests/multinode/rf_fv_mnist/rf_fv_mnist.cfg
@@ -9,24 +9,24 @@ nodes_per_host = 1
 
 [Host1]
 ip = 192.168.1.161
-port = 54321
+port = 47290
 memory_bytes = 200g
 num_cpus = 32
 
 [Host2]
 ip = 192.168.1.162
-port = 54321
+port = 47290
 memory_bytes = 200g
 num_cpus = 32
 
 [Host3]
 ip = 192.168.1.163
-port = 54321
+port = 47290
 memory_bytes = 200g
 num_cpus = 32
 
 [Host4]
 ip = 192.168.1.164
-port = 54321
+port = 47290
 memory_bytes = 200g
 num_cpus = 32
diff --git a/h2o-perf/bench/tests/multinode/summary_one-billion-rows/summary_one-billion-rows.cfg b/h2o-perf/bench/tests/multinode/summary_one-billion-rows/summary_one-billion-rows.cfg
index 7edc79bda9..65c1dcd757 100644
--- a/h2o-perf/bench/tests/multinode/summary_one-billion-rows/summary_one-billion-rows.cfg
+++ b/h2o-perf/bench/tests/multinode/summary_one-billion-rows/summary_one-billion-rows.cfg
@@ -9,24 +9,24 @@ nodes_per_host = 1
 
 [Host1]
 ip = 192.168.1.161
-port = 54321
+port = 16719
 memory_bytes = 200g
 num_cpus = 32
 
 [Host2]
 ip = 192.168.1.162
-port = 54321
+port = 16719
 memory_bytes = 200g
 num_cpus = 32
 
 [Host3]
 ip = 192.168.1.163
-port = 54321
+port = 16719
 memory_bytes = 200g
 num_cpus = 32
 
 [Host4]
 ip = 192.168.1.164
-port = 54321
+port = 16719
 memory_bytes = 200g
 num_cpus = 32
diff --git a/h2o-perf/bench/tests/singlenode/algo_comparison_weather/algo_comparison_weather.cfg b/h2o-perf/bench/tests/singlenode/algo_comparison_weather/algo_comparison_weather.cfg
index a18e83ced8..88d2d26021 100644
--- a/h2o-perf/bench/tests/singlenode/algo_comparison_weather/algo_comparison_weather.cfg
+++ b/h2o-perf/bench/tests/singlenode/algo_comparison_weather/algo_comparison_weather.cfg
@@ -9,6 +9,6 @@ nodes_per_host = 1
 
 [Host1]
 ip = 192.168.1.164
-port = 54321
+port = 31802
 memory_bytes = 50g
 num_cpus = 32
diff --git a/h2o-perf/bench/tests/singlenode/ddply_airlines-1B/ddply_airlines-1B.cfg b/h2o-perf/bench/tests/singlenode/ddply_airlines-1B/ddply_airlines-1B.cfg
index a1ce34c218..087c46602f 100644
--- a/h2o-perf/bench/tests/singlenode/ddply_airlines-1B/ddply_airlines-1B.cfg
+++ b/h2o-perf/bench/tests/singlenode/ddply_airlines-1B/ddply_airlines-1B.cfg
@@ -9,6 +9,6 @@ nodes_per_host = 1
 
 [Host1]
 ip = 192.168.1.162
-port = 54321
+port = 91023
 memory_bytes = 200g
 num_cpus = 32
diff --git a/h2o-perf/bench/tests/singlenode/deeplearning_mnist/deeplearning_mnist.cfg b/h2o-perf/bench/tests/singlenode/deeplearning_mnist/deeplearning_mnist.cfg
index a18e83ced8..068f602a61 100644
--- a/h2o-perf/bench/tests/singlenode/deeplearning_mnist/deeplearning_mnist.cfg
+++ b/h2o-perf/bench/tests/singlenode/deeplearning_mnist/deeplearning_mnist.cfg
@@ -9,6 +9,6 @@ nodes_per_host = 1
 
 [Host1]
 ip = 192.168.1.164
-port = 54321
+port = 32003
 memory_bytes = 50g
 num_cpus = 32
diff --git a/h2o-perf/bench/tests/singlenode/deeplearning_multinomial_correctness_mnist/deeplearning_multinomial_correctness_mnist.cfg b/h2o-perf/bench/tests/singlenode/deeplearning_multinomial_correctness_mnist/deeplearning_multinomial_correctness_mnist.cfg
index a18e83ced8..997951fcb9 100644
--- a/h2o-perf/bench/tests/singlenode/deeplearning_multinomial_correctness_mnist/deeplearning_multinomial_correctness_mnist.cfg
+++ b/h2o-perf/bench/tests/singlenode/deeplearning_multinomial_correctness_mnist/deeplearning_multinomial_correctness_mnist.cfg
@@ -9,6 +9,6 @@ nodes_per_host = 1
 
 [Host1]
 ip = 192.168.1.164
-port = 54321
+port = 62003
 memory_bytes = 50g
 num_cpus = 32
diff --git a/h2o-perf/bench/tests/singlenode/drf_multinomial_correctness_mnist/drf_multinomial_correctness_mnist.cfg b/h2o-perf/bench/tests/singlenode/drf_multinomial_correctness_mnist/drf_multinomial_correctness_mnist.cfg
index d0dd17271f..ef90f235b2 100644
--- a/h2o-perf/bench/tests/singlenode/drf_multinomial_correctness_mnist/drf_multinomial_correctness_mnist.cfg
+++ b/h2o-perf/bench/tests/singlenode/drf_multinomial_correctness_mnist/drf_multinomial_correctness_mnist.cfg
@@ -9,6 +9,6 @@ nodes_per_host = 1
 
 [Host1]
 ip = 192.168.1.164
-port = 54321
+port = 29320
 memory_bytes = 150g
 num_cpus = 32
diff --git a/h2o-perf/bench/tests/singlenode/gbm_covtype/gbm_covtype.cfg b/h2o-perf/bench/tests/singlenode/gbm_covtype/gbm_covtype.cfg
index a18e83ced8..9921995a98 100644
--- a/h2o-perf/bench/tests/singlenode/gbm_covtype/gbm_covtype.cfg
+++ b/h2o-perf/bench/tests/singlenode/gbm_covtype/gbm_covtype.cfg
@@ -9,6 +9,6 @@ nodes_per_host = 1
 
 [Host1]
 ip = 192.168.1.164
-port = 54321
+port = 29302
 memory_bytes = 50g
 num_cpus = 32
diff --git a/h2o-perf/bench/tests/singlenode/gbm_multinomial_correctness_mnist/gbm_multinomial_correctness_mnist.cfg b/h2o-perf/bench/tests/singlenode/gbm_multinomial_correctness_mnist/gbm_multinomial_correctness_mnist.cfg
index a18e83ced8..1b21b26810 100644
--- a/h2o-perf/bench/tests/singlenode/gbm_multinomial_correctness_mnist/gbm_multinomial_correctness_mnist.cfg
+++ b/h2o-perf/bench/tests/singlenode/gbm_multinomial_correctness_mnist/gbm_multinomial_correctness_mnist.cfg
@@ -9,6 +9,6 @@ nodes_per_host = 1
 
 [Host1]
 ip = 192.168.1.164
-port = 54321
+port = 20392
 memory_bytes = 50g
 num_cpus = 32
diff --git a/h2o-perf/bench/tests/singlenode/glm_fv_one-billion-rows/glm_fv_one-billion-rows.cfg b/h2o-perf/bench/tests/singlenode/glm_fv_one-billion-rows/glm_fv_one-billion-rows.cfg
index 2068020b37..c17d7bfa5e 100644
--- a/h2o-perf/bench/tests/singlenode/glm_fv_one-billion-rows/glm_fv_one-billion-rows.cfg
+++ b/h2o-perf/bench/tests/singlenode/glm_fv_one-billion-rows/glm_fv_one-billion-rows.cfg
@@ -9,6 +9,6 @@ nodes_per_host = 1
 
 [Host1]
 ip = 192.168.1.164
-port = 54321
+port = 42940
 memory_bytes = 100g
 num_cpus = 32
diff --git a/h2o-perf/bench/tests/singlenode/kmeans_fv_one-billion-rows/kmeans_fv_one-billion-rows.cfg b/h2o-perf/bench/tests/singlenode/kmeans_fv_one-billion-rows/kmeans_fv_one-billion-rows.cfg
index 2068020b37..994e7cbd96 100644
--- a/h2o-perf/bench/tests/singlenode/kmeans_fv_one-billion-rows/kmeans_fv_one-billion-rows.cfg
+++ b/h2o-perf/bench/tests/singlenode/kmeans_fv_one-billion-rows/kmeans_fv_one-billion-rows.cfg
@@ -9,6 +9,6 @@ nodes_per_host = 1
 
 [Host1]
 ip = 192.168.1.164
-port = 54321
+port = 89230
 memory_bytes = 100g
 num_cpus = 32
diff --git a/h2o-perf/bench/tests/singlenode/pca_airlines/pca_airlines.cfg b/h2o-perf/bench/tests/singlenode/pca_airlines/pca_airlines.cfg
index a18e83ced8..0aba21bca9 100644
--- a/h2o-perf/bench/tests/singlenode/pca_airlines/pca_airlines.cfg
+++ b/h2o-perf/bench/tests/singlenode/pca_airlines/pca_airlines.cfg
@@ -9,6 +9,6 @@ nodes_per_host = 1
 
 [Host1]
 ip = 192.168.1.164
-port = 54321
+port = 65839
 memory_bytes = 50g
 num_cpus = 32
diff --git a/h2o-perf/bench/tests/singlenode/pca_one-billion-rows/pca_one-billion-rows.cfg b/h2o-perf/bench/tests/singlenode/pca_one-billion-rows/pca_one-billion-rows.cfg
index 2068020b37..87c08bd43d 100644
--- a/h2o-perf/bench/tests/singlenode/pca_one-billion-rows/pca_one-billion-rows.cfg
+++ b/h2o-perf/bench/tests/singlenode/pca_one-billion-rows/pca_one-billion-rows.cfg
@@ -9,6 +9,6 @@ nodes_per_host = 1
 
 [Host1]
 ip = 192.168.1.164
-port = 54321
+port = 38281
 memory_bytes = 100g
 num_cpus = 32
diff --git a/h2o-perf/bench/tests/singlenode/rf_fv_mnist/rf_fv_mnist.cfg b/h2o-perf/bench/tests/singlenode/rf_fv_mnist/rf_fv_mnist.cfg
index d0dd17271f..9849f81fba 100644
--- a/h2o-perf/bench/tests/singlenode/rf_fv_mnist/rf_fv_mnist.cfg
+++ b/h2o-perf/bench/tests/singlenode/rf_fv_mnist/rf_fv_mnist.cfg
@@ -9,6 +9,6 @@ nodes_per_host = 1
 
 [Host1]
 ip = 192.168.1.164
-port = 54321
+port = 23792
 memory_bytes = 150g
 num_cpus = 32
diff --git a/h2o-perf/bench/tests/singlenode/summary_one-billion-rows/summary_one-billion-rows.cfg b/h2o-perf/bench/tests/singlenode/summary_one-billion-rows/summary_one-billion-rows.cfg
index 2068020b37..86f719f824 100644
--- a/h2o-perf/bench/tests/singlenode/summary_one-billion-rows/summary_one-billion-rows.cfg
+++ b/h2o-perf/bench/tests/singlenode/summary_one-billion-rows/summary_one-billion-rows.cfg
@@ -9,6 +9,6 @@ nodes_per_host = 1
 
 [Host1]
 ip = 192.168.1.164
-port = 54321
+port = 42379
 memory_bytes = 100g
 num_cpus = 32
diff --git a/h2o-zookeeper/.gitignore b/h2o-zookeeper/.gitignore
new file mode 100644
index 0000000000..91ea7410d8
--- /dev/null
+++ b/h2o-zookeeper/.gitignore
@@ -0,0 +1,2 @@
+build
+.gradle
diff --git a/py/testdir_0xdata_only/.gitignore b/py/testdir_0xdata_only/.gitignore
new file mode 100644
index 0000000000..b9f06b5174
--- /dev/null
+++ b/py/testdir_0xdata_only/.gitignore
@@ -0,0 +1 @@
+test_*.xml
diff --git a/py/testdir_0xdata_slow/.gitignore b/py/testdir_0xdata_slow/.gitignore
new file mode 100644
index 0000000000..b9f06b5174
--- /dev/null
+++ b/py/testdir_0xdata_slow/.gitignore
@@ -0,0 +1 @@
+test_*.xml
diff --git a/py/testdir_ec2/.gitignore b/py/testdir_ec2/.gitignore
new file mode 100644
index 0000000000..b9f06b5174
--- /dev/null
+++ b/py/testdir_ec2/.gitignore
@@ -0,0 +1 @@
+test_*.xml
diff --git a/py/testdir_ec2_only/.gitignore b/py/testdir_ec2_only/.gitignore
new file mode 100644
index 0000000000..b9f06b5174
--- /dev/null
+++ b/py/testdir_ec2_only/.gitignore
@@ -0,0 +1 @@
+test_*.xml
diff --git a/py/testdir_ec2_slow/.gitignore b/py/testdir_ec2_slow/.gitignore
new file mode 100644
index 0000000000..b9f06b5174
--- /dev/null
+++ b/py/testdir_ec2_slow/.gitignore
@@ -0,0 +1 @@
+test_*.xml
diff --git a/py/testdir_golden/.gitignore b/py/testdir_golden/.gitignore
new file mode 100644
index 0000000000..b9f06b5174
--- /dev/null
+++ b/py/testdir_golden/.gitignore
@@ -0,0 +1 @@
+test_*.xml
diff --git a/py/testdir_hosts/.gitignore b/py/testdir_hosts/.gitignore
new file mode 100644
index 0000000000..b9f06b5174
--- /dev/null
+++ b/py/testdir_hosts/.gitignore
@@ -0,0 +1 @@
+test_*.xml
diff --git a/py/testdir_hosts_fvec/.gitignore b/py/testdir_hosts_fvec/.gitignore
new file mode 100644
index 0000000000..b9f06b5174
--- /dev/null
+++ b/py/testdir_hosts_fvec/.gitignore
@@ -0,0 +1 @@
+test_*.xml
diff --git a/py/testdir_multi_jvm/.gitignore b/py/testdir_multi_jvm/.gitignore
new file mode 100644
index 0000000000..b9f06b5174
--- /dev/null
+++ b/py/testdir_multi_jvm/.gitignore
@@ -0,0 +1 @@
+test_*.xml
diff --git a/py/testdir_multi_jvm2/.gitignore b/py/testdir_multi_jvm2/.gitignore
new file mode 100644
index 0000000000..b9f06b5174
--- /dev/null
+++ b/py/testdir_multi_jvm2/.gitignore
@@ -0,0 +1 @@
+test_*.xml
diff --git a/py/testdir_multi_jvm_fvec/.gitignore b/py/testdir_multi_jvm_fvec/.gitignore
new file mode 100644
index 0000000000..b9f06b5174
--- /dev/null
+++ b/py/testdir_multi_jvm_fvec/.gitignore
@@ -0,0 +1 @@
+test_*.xml
diff --git a/py/testdir_release/.gitignore b/py/testdir_release/.gitignore
new file mode 100644
index 0000000000..b9f06b5174
--- /dev/null
+++ b/py/testdir_release/.gitignore
@@ -0,0 +1 @@
+test_*.xml
diff --git a/py/testdir_rpy2/.gitignore b/py/testdir_rpy2/.gitignore
new file mode 100644
index 0000000000..b9f06b5174
--- /dev/null
+++ b/py/testdir_rpy2/.gitignore
@@ -0,0 +1 @@
+test_*.xml
diff --git a/py/testdir_single_jvm/.gitignore b/py/testdir_single_jvm/.gitignore
new file mode 100644
index 0000000000..b9f06b5174
--- /dev/null
+++ b/py/testdir_single_jvm/.gitignore
@@ -0,0 +1 @@
+test_*.xml
diff --git a/py/testdir_single_jvm_fvec/.gitignore b/py/testdir_single_jvm_fvec/.gitignore
new file mode 100644
index 0000000000..b9f06b5174
--- /dev/null
+++ b/py/testdir_single_jvm_fvec/.gitignore
@@ -0,0 +1 @@
+test_*.xml
diff --git a/src/test/java/hex/KMeans2Test.java b/src/test/java/hex/KMeans2Test.java
index f585fe719c..3a6e027b53 100644
--- a/src/test/java/hex/KMeans2Test.java
+++ b/src/test/java/hex/KMeans2Test.java
@@ -160,7 +160,7 @@ static double dist(double[] cluster, double[] goal) {
 
   @Test public void testSphere() {
     Key dest = Key.make("dest");
-    Frame frame = parseFrame(dest, "smalldata/syn_sphere3.csv");
+    Frame frame = parseFrame(dest, "smalldata/syn_sphere2.csv");
     KMeans2 algo = new KMeans2();
     algo.source = frame;
     algo.k = 3;
diff --git a/src/test/java/water/JUnitRunner.java b/src/test/java/water/JUnitRunner.java
index 5db71b65b8..b891cfa7fc 100644
--- a/src/test/java/water/JUnitRunner.java
+++ b/src/test/java/water/JUnitRunner.java
@@ -43,7 +43,6 @@ private static void filter(List<Class> tests) {
     tests.remove(GLMRandomTest.Short.class);
     tests.remove(GLMRandomTest.Long.class);
     tests.remove(ParserTest2.ParseAllSmalldata.class);
-    tests.remove(TestKeySnapshotLong.class);
     // Skip abstract test
     tests.remove(TreeTestWithBalanceAndCrossVal.class);
 
diff --git a/src/test/java/water/TestKeySnapshotLong.java b/src/test/java/water/TestKeySnapshotLong.java
deleted file mode 100644
index c3478e08f8..0000000000
--- a/src/test/java/water/TestKeySnapshotLong.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package water;
-
-import java.util.Random;
-
-import junit.framework.Assert;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import water.util.Utils;
-
-public class TestKeySnapshotLong extends TestUtil {
-  @BeforeClass public static void stall() { stall_till_cloudsize(3); }
-
-  /** Test for PUB-895 simulating Exec2 scenario.
-   * <p>The scenario runs on 3JVMs and generates in single thread
-   * keys, and takes snapshots (since each iteration of Exec2 invoked
-   * from R rebuilds environment).
-   * </p>
-   * <p>The goal of the test is to make snaphost
-   * at the time when the underlying NBHM is expanding</p>
-   */
-  @Test public void testGlobalKeySetIterativelly(){
-    int i = 0;
-    Random rng = new Random(0xa7a34721109d3708L ^ System.currentTimeMillis());
-    try {
-      for (i = 0; i < 50000; ++i) {
-        UKV.put(Key.make("key" + i), new Utils.IcedInt(i));
-        if (i % (rng.nextInt(31)+1) == 0) {
-          Key[] keys2 = H2O.KeySnapshot.globalSnapshot().keys();
-          Assert.assertEquals(i+1, keys2.length);
-        }
-      }
-    } finally {
-      Futures fs = new Futures();
-      for (int j = 0; j < i; ++j) {
-        DKV.remove(Key.make("key" + j),fs);
-      }
-      fs.blockForPending();
-    }
-  }
-}
diff --git a/src/test/java/water/suites/AllTestsSuite.java b/src/test/java/water/suites/AllTestsSuite.java
index 0e616909c2..476dd7e2fe 100644
--- a/src/test/java/water/suites/AllTestsSuite.java
+++ b/src/test/java/water/suites/AllTestsSuite.java
@@ -83,7 +83,6 @@
   water.score.ScoreTest.class,
   water.serial.ModelSerializationTest.class,
   water.TestKeySnapshot.class,
-  water.TestKeySnapshotLong.class,
   water.TypeAheadTest.class,
   water.util.ModelUtilsTest.class,
   water.util.SBTest.class,