13 files changed, 0 insertions, 949 deletions
diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/executors/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/executors/json_expectation
deleted file mode 100644
index cb622e1472..0000000000
--- a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/executors/json_expectation
+++ /dev/null
@@ -1,17 +0,0 @@
-[ {
-  "id" : "<driver>",
-  "hostPort" : "localhost:57971",
-  "rddBlocks" : 8,
-  "memoryUsed" : 28000128,
-  "diskUsed" : 0,
-  "activeTasks" : 0,
-  "failedTasks" : 1,
-  "completedTasks" : 31,
-  "totalTasks" : 32,
-  "totalDuration" : 8820,
-  "totalInputBytes" : 28000288,
-  "totalShuffleRead" : 0,
-  "totalShuffleWrite" : 13180,
-  "maxMemory" : 278302556,
-  "executorLogs" : { }
-} ]
-\ No newline at end of file
diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/jobs/0/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/jobs/0/json_expectation
deleted file mode 100644
index 4a29072bdb..0000000000
--- a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/jobs/0/json_expectation
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "jobId" : 0,
-  "name" : "count at <console>:15",
-  "stageIds" : [ 0 ],
-  "status" : "SUCCEEDED",
-  "numTasks" : 8,
-  "numActiveTasks" : 0,
-  "numCompletedTasks" : 8,
-  "numSkippedTasks" : 8,
-  "numFailedTasks" : 0,
-  "numActiveStages" : 0,
-  "numCompletedStages" : 1,
-  "numSkippedStages" : 0,
-  "numFailedStages" : 0
-}
-\ No newline at end of file
diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/jobs/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/jobs/json_expectation
deleted file mode 100644
index cab4750270..0000000000
--- a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/jobs/json_expectation
+++ /dev/null
@@ -1,43 +0,0 @@
-[ {
-  "jobId" : 2,
-  "name" : "count at <console>:17",
-  "stageIds" : [ 3 ],
-  "status" : "SUCCEEDED",
-  "numTasks" : 8,
-  "numActiveTasks" : 0,
-  "numCompletedTasks" : 8,
-  "numSkippedTasks" : 8,
-  "numFailedTasks" : 0,
-  "numActiveStages" : 0,
-  "numCompletedStages" : 1,
-  "numSkippedStages" : 0,
-  "numFailedStages" : 0
-}, {
-  "jobId" : 1,
-  "name" : "count at <console>:20",
-  "stageIds" : [ 1, 2 ],
-  "status" : "FAILED",
-  "numTasks" : 16,
-  "numActiveTasks" : 0,
-  "numCompletedTasks" : 15,
-  "numSkippedTasks" : 15,
-  "numFailedTasks" : 1,
-  "numActiveStages" : 0,
-  "numCompletedStages" : 1,
-  "numSkippedStages" : 0,
-  "numFailedStages" : 1
-}, {
-  "jobId" : 0,
-  "name" : "count at <console>:15",
-  "stageIds" : [ 0 ],
-  "status" : "SUCCEEDED",
-  "numTasks" : 8,
-  "numActiveTasks" : 0,
-  "numCompletedTasks" : 8,
-  "numSkippedTasks" : 8,
-  "numFailedTasks" : 0,
-  "numActiveStages" : 0,
-  "numCompletedStages" : 1,
-  "numSkippedStages" : 0,
-  "numFailedStages" : 0
-} ]
-\ No newline at end of file
diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/jobs?status=succeeded&status=failed/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/jobs?status=succeeded&status=failed/json_expectation
deleted file mode 100644
index cab4750270..0000000000
--- a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/jobs?status=succeeded&status=failed/json_expectation
+++ /dev/null
@@ -1,43 +0,0 @@
-[ {
-  "jobId" : 2,
-  "name" : "count at <console>:17",
-  "stageIds" : [ 3 ],
-  "status" : "SUCCEEDED",
-  "numTasks" : 8,
-  "numActiveTasks" : 0,
-  "numCompletedTasks" : 8,
-  "numSkippedTasks" : 8,
-  "numFailedTasks" : 0,
-  "numActiveStages" : 0,
-  "numCompletedStages" : 1,
-  "numSkippedStages" : 0,
-  "numFailedStages" : 0
-}, {
-  "jobId" : 1,
-  "name" : "count at <console>:20",
-  "stageIds" : [ 1, 2 ],
-  "status" : "FAILED",
-  "numTasks" : 16,
-  "numActiveTasks" : 0,
-  "numCompletedTasks" : 15,
-  "numSkippedTasks" : 15,
-  "numFailedTasks" : 1,
-  "numActiveStages" : 0,
-  "numCompletedStages" : 1,
-  "numSkippedStages" : 0,
-  "numFailedStages" : 1
-}, {
-  "jobId" : 0,
-  "name" : "count at <console>:15",
-  "stageIds" : [ 0 ],
-  "status" : "SUCCEEDED",
-  "numTasks" : 8,
-  "numActiveTasks" : 0,
-  "numCompletedTasks" : 8,
-  "numSkippedTasks" : 8,
-  "numFailedTasks" : 0,
-  "numActiveStages" : 0,
-  "numCompletedStages" : 1,
-  "numSkippedStages" : 0,
-  "numFailedStages" : 0
-} ]
-\ No newline at end of file
diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/jobs?status=succeeded/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/jobs?status=succeeded/json_expectation
deleted file mode 100644
index 6fd25befbf..0000000000
--- a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/jobs?status=succeeded/json_expectation
+++ /dev/null
@@ -1,29 +0,0 @@
-[ {
-  "jobId" : 2,
-  "name" : "count at <console>:17",
-  "stageIds" : [ 3 ],
-  "status" : "SUCCEEDED",
-  "numTasks" : 8,
-  "numActiveTasks" : 0,
-  "numCompletedTasks" : 8,
-  "numSkippedTasks" : 8,
-  "numFailedTasks" : 0,
-  "numActiveStages" : 0,
-  "numCompletedStages" : 1,
-  "numSkippedStages" : 0,
-  "numFailedStages" : 0
-}, {
-  "jobId" : 0,
-  "name" : "count at <console>:15",
-  "stageIds" : [ 0 ],
-  "status" : "SUCCEEDED",
-  "numTasks" : 8,
-  "numActiveTasks" : 0,
-  "numCompletedTasks" : 8,
-  "numSkippedTasks" : 8,
-  "numFailedTasks" : 0,
-  "numActiveStages" : 0,
-  "numCompletedStages" : 1,
-  "numSkippedStages" : 0,
-  "numFailedStages" : 0
-} ]
-\ No newline at end of file
diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/json_expectation
deleted file mode 100644
index 07489ad964..0000000000
--- a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/json_expectation
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "id" : "local-1422981780767",
-  "name" : "Spark shell",
-  "attempts" : [ {
-    "startTime" : "2015-02-03T16:42:59.720GMT",
-    "endTime" : "2015-02-03T16:43:08.731GMT",
-    "sparkUser" : "irashid",
-    "completed" : true
-  } ]
-}
-\ No newline at end of file
diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages/1/0/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages/1/0/json_expectation
deleted file mode 100644
index 111cb8163e..0000000000
--- a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages/1/0/json_expectation
+++ /dev/null
@@ -1,270 +0,0 @@
-{
-  "status" : "COMPLETE",
-  "stageId" : 1,
-  "attemptId" : 0,
-  "numActiveTasks" : 0,
-  "numCompleteTasks" : 8,
-  "numFailedTasks" : 0,
-  "executorRunTime" : 3476,
-  "inputBytes" : 28000128,
-  "inputRecords" : 0,
-  "outputBytes" : 0,
-  "outputRecords" : 0,
-  "shuffleReadBytes" : 0,
-  "shuffleReadRecords" : 0,
-  "shuffleWriteBytes" : 13180,
-  "shuffleWriteRecords" : 0,
-  "memoryBytesSpilled" : 0,
-  "diskBytesSpilled" : 0,
-  "name" : "map at <console>:14",
-  "details" : "org.apache.spark.rdd.RDD.map(RDD.scala:271)\n$line10.$read$$iwC$$iwC$$iwC$$iwC.<init>(<console>:14)\n$line10.$read$$iwC$$iwC$$iwC.<init>(<console>:19)\n$line10.$read$$iwC$$iwC.<init>(<console>:21)\n$line10.$read$$iwC.<init>(<console>:23)\n$line10.$read.<init>(<console>:25)\n$line10.$read$.<init>(<console>:29)\n$line10.$read$.<clinit>(<console>)\n$line10.$eval$.<init>(<console>:7)\n$line10.$eval$.<clinit>(<console>)\n$line10.$eval.$print(<console>)\nsun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\nsun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)\nsun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\njava.lang.reflect.Method.invoke(Method.java:606)\norg.apache.spark.repl.SparkIMain$ReadEvalPrint.call(SparkIMain.scala:852)\norg.apache.spark.repl.SparkIMain$Request.loadAndRun(SparkIMain.scala:1125)\norg.apache.spark.repl.SparkIMain.loadAndRunReq$1(SparkIMain.scala:674)\norg.apache.spark.repl.SparkIMain.interpret(SparkIMain.scala:705)\norg.apache.spark.repl.SparkIMain.interpret(SparkIMain.scala:669)",
-  "schedulingPool" : "default",
-  "accumulatorUpdates" : [ ],
-  "tasks" : {
-    "8" : {
-      "taskId" : 8,
-      "index" : 0,
-      "attempt" : 0,
-      "launchTime" : "2015-02-03T16:43:05.829GMT",
-      "executorId" : "<driver>",
-      "host" : "localhost",
-      "taskLocality" : "PROCESS_LOCAL",
-      "speculative" : false,
-      "accumulatorUpdates" : [ ],
-      "taskMetrics" : {
-        "executorDeserializeTime" : 1,
-        "executorRunTime" : 435,
-        "resultSize" : 1902,
-        "jvmGcTime" : 19,
-        "resultSerializationTime" : 2,
-        "memoryBytesSpilled" : 0,
-        "diskBytesSpilled" : 0,
-        "inputMetrics" : {
-          "bytesRead" : 3500016,
-          "recordsRead" : 0
-        },
-        "shuffleWriteMetrics" : {
-          "bytesWritten" : 1648,
-          "writeTime" : 94000,
-          "recordsWritten" : 0
-        }
-      }
-    },
-    "11" : {
-      "taskId" : 11,
-      "index" : 3,
-      "attempt" : 0,
-      "launchTime" : "2015-02-03T16:43:05.830GMT",
-      "executorId" : "<driver>",
-      "host" : "localhost",
-      "taskLocality" : "PROCESS_LOCAL",
-      "speculative" : false,
-      "accumulatorUpdates" : [ ],
-      "taskMetrics" : {
-        "executorDeserializeTime" : 2,
-        "executorRunTime" : 434,
-        "resultSize" : 1902,
-        "jvmGcTime" : 19,
-        "resultSerializationTime" : 1,
-        "memoryBytesSpilled" : 0,
-        "diskBytesSpilled" : 0,
-        "inputMetrics" : {
-          "bytesRead" : 3500016,
-          "recordsRead" : 0
-        },
-        "shuffleWriteMetrics" : {
-          "bytesWritten" : 1647,
-          "writeTime" : 83000,
-          "recordsWritten" : 0
-        }
-      }
-    },
-    "14" : {
-      "taskId" : 14,
-      "index" : 6,
-      "attempt" : 0,
-      "launchTime" : "2015-02-03T16:43:05.832GMT",
-      "executorId" : "<driver>",
-      "host" : "localhost",
-      "taskLocality" : "PROCESS_LOCAL",
-      "speculative" : false,
-      "accumulatorUpdates" : [ ],
-      "taskMetrics" : {
-        "executorDeserializeTime" : 2,
-        "executorRunTime" : 434,
-        "resultSize" : 1902,
-        "jvmGcTime" : 19,
-        "resultSerializationTime" : 1,
-        "memoryBytesSpilled" : 0,
-        "diskBytesSpilled" : 0,
-        "inputMetrics" : {
-          "bytesRead" : 3500016,
-          "recordsRead" : 0
-        },
-        "shuffleWriteMetrics" : {
-          "bytesWritten" : 1648,
-          "writeTime" : 88000,
-          "recordsWritten" : 0
-        }
-      }
-    },
-    "13" : {
-      "taskId" : 13,
-      "index" : 5,
-      "attempt" : 0,
-      "launchTime" : "2015-02-03T16:43:05.831GMT",
-      "executorId" : "<driver>",
-      "host" : "localhost",
-      "taskLocality" : "PROCESS_LOCAL",
-      "speculative" : false,
-      "accumulatorUpdates" : [ ],
-      "taskMetrics" : {
-        "executorDeserializeTime" : 2,
-        "executorRunTime" : 434,
-        "resultSize" : 1902,
-        "jvmGcTime" : 19,
-        "resultSerializationTime" : 2,
-        "memoryBytesSpilled" : 0,
-        "diskBytesSpilled" : 0,
-        "inputMetrics" : {
-          "bytesRead" : 3500016,
-          "recordsRead" : 0
-        },
-        "shuffleWriteMetrics" : {
-          "bytesWritten" : 1648,
-          "writeTime" : 73000,
-          "recordsWritten" : 0
-        }
-      }
-    },
-    "10" : {
-      "taskId" : 10,
-      "index" : 2,
-      "attempt" : 0,
-      "launchTime" : "2015-02-03T16:43:05.830GMT",
-      "executorId" : "<driver>",
-      "host" : "localhost",
-      "taskLocality" : "PROCESS_LOCAL",
-      "speculative" : false,
-      "accumulatorUpdates" : [ ],
-      "taskMetrics" : {
-        "executorDeserializeTime" : 2,
-        "executorRunTime" : 434,
-        "resultSize" : 1902,
-        "jvmGcTime" : 19,
-        "resultSerializationTime" : 1,
-        "memoryBytesSpilled" : 0,
-        "diskBytesSpilled" : 0,
-        "inputMetrics" : {
-          "bytesRead" : 3500016,
-          "recordsRead" : 0
-        },
-        "shuffleWriteMetrics" : {
-          "bytesWritten" : 1648,
-          "writeTime" : 76000,
-          "recordsWritten" : 0
-        }
-      }
-    },
-    "9" : {
-      "taskId" : 9,
-      "index" : 1,
-      "attempt" : 0,
-      "launchTime" : "2015-02-03T16:43:05.830GMT",
-      "executorId" : "<driver>",
-      "host" : "localhost",
-      "taskLocality" : "PROCESS_LOCAL",
-      "speculative" : false,
-      "accumulatorUpdates" : [ ],
-      "taskMetrics" : {
-        "executorDeserializeTime" : 1,
-        "executorRunTime" : 436,
-        "resultSize" : 1902,
-        "jvmGcTime" : 19,
-        "resultSerializationTime" : 0,
-        "memoryBytesSpilled" : 0,
-        "diskBytesSpilled" : 0,
-        "inputMetrics" : {
-          "bytesRead" : 3500016,
-          "recordsRead" : 0
-        },
-        "shuffleWriteMetrics" : {
-          "bytesWritten" : 1648,
-          "writeTime" : 98000,
-          "recordsWritten" : 0
-        }
-      }
-    },
-    "12" : {
-      "taskId" : 12,
-      "index" : 4,
-      "attempt" : 0,
-      "launchTime" : "2015-02-03T16:43:05.831GMT",
-      "executorId" : "<driver>",
-      "host" : "localhost",
-      "taskLocality" : "PROCESS_LOCAL",
-      "speculative" : false,
-      "accumulatorUpdates" : [ ],
-      "taskMetrics" : {
-        "executorDeserializeTime" : 2,
-        "executorRunTime" : 434,
-        "resultSize" : 1902,
-        "jvmGcTime" : 19,
-        "resultSerializationTime" : 1,
-        "memoryBytesSpilled" : 0,
-        "diskBytesSpilled" : 0,
-        "inputMetrics" : {
-          "bytesRead" : 3500016,
-          "recordsRead" : 0
-        },
-        "shuffleWriteMetrics" : {
-          "bytesWritten" : 1645,
-          "writeTime" : 101000,
-          "recordsWritten" : 0
-        }
-      }
-    },
-    "15" : {
-      "taskId" : 15,
-      "index" : 7,
-      "attempt" : 0,
-      "launchTime" : "2015-02-03T16:43:05.833GMT",
-      "executorId" : "<driver>",
-      "host" : "localhost",
-      "taskLocality" : "PROCESS_LOCAL",
-      "speculative" : false,
-      "accumulatorUpdates" : [ ],
-      "taskMetrics" : {
-        "executorDeserializeTime" : 1,
-        "executorRunTime" : 435,
-        "resultSize" : 1902,
-        "jvmGcTime" : 19,
-        "resultSerializationTime" : 1,
-        "memoryBytesSpilled" : 0,
-        "diskBytesSpilled" : 0,
-        "inputMetrics" : {
-          "bytesRead" : 3500016,
-          "recordsRead" : 0
-        },
-        "shuffleWriteMetrics" : {
-          "bytesWritten" : 1648,
-          "writeTime" : 79000,
-          "recordsWritten" : 0
-        }
-      }
-    }
-  },
-  "executorSummary" : {
-    "<driver>" : {
-      "taskTime" : 3624,
-      "failedTasks" : 0,
-      "succeededTasks" : 8,
-      "inputBytes" : 28000128,
-      "outputBytes" : 0,
-      "shuffleRead" : 0,
-      "shuffleWrite" : 13180,
-      "memoryBytesSpilled" : 0,
-      "diskBytesSpilled" : 0
-    }
-  }
-}
-\ No newline at end of file
diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages/1/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages/1/json_expectation
deleted file mode 100644
index ef339f89af..0000000000
--- a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages/1/json_expectation
+++ /dev/null
@@ -1,270 +0,0 @@
-[ {
-  "status" : "COMPLETE",
-  "stageId" : 1,
-  "attemptId" : 0,
-  "numActiveTasks" : 0,
-  "numCompleteTasks" : 8,
-  "numFailedTasks" : 0,
-  "executorRunTime" : 3476,
-  "inputBytes" : 28000128,
-  "inputRecords" : 0,
-  "outputBytes" : 0,
-  "outputRecords" : 0,
-  "shuffleReadBytes" : 0,
-  "shuffleReadRecords" : 0,
-  "shuffleWriteBytes" : 13180,
-  "shuffleWriteRecords" : 0,
-  "memoryBytesSpilled" : 0,
-  "diskBytesSpilled" : 0,
-  "name" : "map at <console>:14",
-  "details" : "org.apache.spark.rdd.RDD.map(RDD.scala:271)\n$line10.$read$$iwC$$iwC$$iwC$$iwC.<init>(<console>:14)\n$line10.$read$$iwC$$iwC$$iwC.<init>(<console>:19)\n$line10.$read$$iwC$$iwC.<init>(<console>:21)\n$line10.$read$$iwC.<init>(<console>:23)\n$line10.$read.<init>(<console>:25)\n$line10.$read$.<init>(<console>:29)\n$line10.$read$.<clinit>(<console>)\n$line10.$eval$.<init>(<console>:7)\n$line10.$eval$.<clinit>(<console>)\n$line10.$eval.$print(<console>)\nsun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\nsun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)\nsun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\njava.lang.reflect.Method.invoke(Method.java:606)\norg.apache.spark.repl.SparkIMain$ReadEvalPrint.call(SparkIMain.scala:852)\norg.apache.spark.repl.SparkIMain$Request.loadAndRun(SparkIMain.scala:1125)\norg.apache.spark.repl.SparkIMain.loadAndRunReq$1(SparkIMain.scala:674)\norg.apache.spark.repl.SparkIMain.interpret(SparkIMain.scala:705)\norg.apache.spark.repl.SparkIMain.interpret(SparkIMain.scala:669)",
-  "schedulingPool" : "default",
-  "accumulatorUpdates" : [ ],
-  "tasks" : {
-    "8" : {
-      "taskId" : 8,
-      "index" : 0,
-      "attempt" : 0,
-      "launchTime" : "2015-02-03T16:43:05.829GMT",
-      "executorId" : "<driver>",
-      "host" : "localhost",
-      "taskLocality" : "PROCESS_LOCAL",
-      "speculative" : false,
-      "accumulatorUpdates" : [ ],
-      "taskMetrics" : {
-        "executorDeserializeTime" : 1,
-        "executorRunTime" : 435,
-        "resultSize" : 1902,
-        "jvmGcTime" : 19,
-        "resultSerializationTime" : 2,
-        "memoryBytesSpilled" : 0,
-        "diskBytesSpilled" : 0,
-        "inputMetrics" : {
-          "bytesRead" : 3500016,
-          "recordsRead" : 0
-        },
-        "shuffleWriteMetrics" : {
-          "bytesWritten" : 1648,
-          "writeTime" : 94000,
-          "recordsWritten" : 0
-        }
-      }
-    },
-    "11" : {
-      "taskId" : 11,
-      "index" : 3,
-      "attempt" : 0,
-      "launchTime" : "2015-02-03T16:43:05.830GMT",
-      "executorId" : "<driver>",
-      "host" : "localhost",
-      "taskLocality" : "PROCESS_LOCAL",
-      "speculative" : false,
-      "accumulatorUpdates" : [ ],
-      "taskMetrics" : {
-        "executorDeserializeTime" : 2,
-        "executorRunTime" : 434,
-        "resultSize" : 1902,
-        "jvmGcTime" : 19,
-        "resultSerializationTime" : 1,
-        "memoryBytesSpilled" : 0,
-        "diskBytesSpilled" : 0,
-        "inputMetrics" : {
-          "bytesRead" : 3500016,
-          "recordsRead" : 0
-        },
-        "shuffleWriteMetrics" : {
-          "bytesWritten" : 1647,
-          "writeTime" : 83000,
-          "recordsWritten" : 0
-        }
-      }
-    },
-    "14" : {
-      "taskId" : 14,
-      "index" : 6,
-      "attempt" : 0,
-      "launchTime" : "2015-02-03T16:43:05.832GMT",
-      "executorId" : "<driver>",
-      "host" : "localhost",
-      "taskLocality" : "PROCESS_LOCAL",
-      "speculative" : false,
-      "accumulatorUpdates" : [ ],
-      "taskMetrics" : {
-        "executorDeserializeTime" : 2,
-        "executorRunTime" : 434,
-        "resultSize" : 1902,
-        "jvmGcTime" : 19,
-        "resultSerializationTime" : 1,
-        "memoryBytesSpilled" : 0,
-        "diskBytesSpilled" : 0,
-        "inputMetrics" : {
-          "bytesRead" : 3500016,
-          "recordsRead" : 0
-        },
-        "shuffleWriteMetrics" : {
-          "bytesWritten" : 1648,
-          "writeTime" : 88000,
-          "recordsWritten" : 0
-        }
-      }
-    },
-    "13" : {
-      "taskId" : 13,
-      "index" : 5,
-      "attempt" : 0,
-      "launchTime" : "2015-02-03T16:43:05.831GMT",
-      "executorId" : "<driver>",
-      "host" : "localhost",
-      "taskLocality" : "PROCESS_LOCAL",
-      "speculative" : false,
-      "accumulatorUpdates" : [ ],
-      "taskMetrics" : {
-        "executorDeserializeTime" : 2,
-        "executorRunTime" : 434,
-        "resultSize" : 1902,
-        "jvmGcTime" : 19,
-        "resultSerializationTime" : 2,
-        "memoryBytesSpilled" : 0,
-        "diskBytesSpilled" : 0,
-        "inputMetrics" : {
-          "bytesRead" : 3500016,
-          "recordsRead" : 0
-        },
-        "shuffleWriteMetrics" : {
-          "bytesWritten" : 1648,
-          "writeTime" : 73000,
-          "recordsWritten" : 0
-        }
-      }
-    },
-    "10" : {
-      "taskId" : 10,
-      "index" : 2,
-      "attempt" : 0,
-      "launchTime" : "2015-02-03T16:43:05.830GMT",
-      "executorId" : "<driver>",
-      "host" : "localhost",
-      "taskLocality" : "PROCESS_LOCAL",
-      "speculative" : false,
-      "accumulatorUpdates" : [ ],
-      "taskMetrics" : {
-        "executorDeserializeTime" : 2,
-        "executorRunTime" : 434,
-        "resultSize" : 1902,
-        "jvmGcTime" : 19,
-        "resultSerializationTime" : 1,
-        "memoryBytesSpilled" : 0,
-        "diskBytesSpilled" : 0,
-        "inputMetrics" : {
-          "bytesRead" : 3500016,
-          "recordsRead" : 0
-        },
-        "shuffleWriteMetrics" : {
-          "bytesWritten" : 1648,
-          "writeTime" : 76000,
-          "recordsWritten" : 0
-        }
-      }
-    },
-    "9" : {
-      "taskId" : 9,
-      "index" : 1,
-      "attempt" : 0,
-      "launchTime" : "2015-02-03T16:43:05.830GMT",
-      "executorId" : "<driver>",
-      "host" : "localhost",
-      "taskLocality" : "PROCESS_LOCAL",
-      "speculative" : false,
-      "accumulatorUpdates" : [ ],
-      "taskMetrics" : {
-        "executorDeserializeTime" : 1,
-        "executorRunTime" : 436,
-        "resultSize" : 1902,
-        "jvmGcTime" : 19,
-        "resultSerializationTime" : 0,
-        "memoryBytesSpilled" : 0,
-        "diskBytesSpilled" : 0,
-        "inputMetrics" : {
-          "bytesRead" : 3500016,
-          "recordsRead" : 0
-        },
-        "shuffleWriteMetrics" : {
-          "bytesWritten" : 1648,
-          "writeTime" : 98000,
-          "recordsWritten" : 0
-        }
-      }
-    },
-    "12" : {
-      "taskId" : 12,
-      "index" : 4,
-      "attempt" : 0,
-      "launchTime" : "2015-02-03T16:43:05.831GMT",
-      "executorId" : "<driver>",
-      "host" : "localhost",
-      "taskLocality" : "PROCESS_LOCAL",
-      "speculative" : false,
-      "accumulatorUpdates" : [ ],
-      "taskMetrics" : {
-        "executorDeserializeTime" : 2,
-        "executorRunTime" : 434,
-        "resultSize" : 1902,
-        "jvmGcTime" : 19,
-        "resultSerializationTime" : 1,
-        "memoryBytesSpilled" : 0,
-        "diskBytesSpilled" : 0,
-        "inputMetrics" : {
-          "bytesRead" : 3500016,
-          "recordsRead" : 0
-        },
-        "shuffleWriteMetrics" : {
-          "bytesWritten" : 1645,
-          "writeTime" : 101000,
-          "recordsWritten" : 0
-        }
-      }
-    },
-    "15" : {
-      "taskId" : 15,
-      "index" : 7,
-      "attempt" : 0,
-      "launchTime" : "2015-02-03T16:43:05.833GMT",
-      "executorId" : "<driver>",
-      "host" : "localhost",
-      "taskLocality" : "PROCESS_LOCAL",
-      "speculative" : false,
-      "accumulatorUpdates" : [ ],
-      "taskMetrics" : {
-        "executorDeserializeTime" : 1,
-        "executorRunTime" : 435,
-        "resultSize" : 1902,
-        "jvmGcTime" : 19,
-        "resultSerializationTime" : 1,
-        "memoryBytesSpilled" : 0,
-        "diskBytesSpilled" : 0,
-        "inputMetrics" : {
-          "bytesRead" : 3500016,
-          "recordsRead" : 0
-        },
-        "shuffleWriteMetrics" : {
-          "bytesWritten" : 1648,
-          "writeTime" : 79000,
-          "recordsWritten" : 0
-        }
-      }
-    }
-  },
-  "executorSummary" : {
-    "<driver>" : {
-      "taskTime" : 3624,
-      "failedTasks" : 0,
-      "succeededTasks" : 8,
-      "inputBytes" : 28000128,
-      "outputBytes" : 0,
-      "shuffleRead" : 0,
-      "shuffleWrite" : 13180,
-      "memoryBytesSpilled" : 0,
-      "diskBytesSpilled" : 0
-    }
-  }
-} ]
-\ No newline at end of file
diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages/json_expectation
deleted file mode 100644
index 056fac7088..0000000000
--- a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages/json_expectation
+++ /dev/null
@@ -1,89 +0,0 @@
-[ {
-  "status" : "COMPLETE",
-  "stageId" : 3,
-  "attemptId" : 0,
-  "numActiveTasks" : 0,
-  "numCompleteTasks" : 8,
-  "numFailedTasks" : 0,
-  "executorRunTime" : 162,
-  "inputBytes" : 160,
-  "inputRecords" : 0,
-  "outputBytes" : 0,
-  "outputRecords" : 0,
-  "shuffleReadBytes" : 0,
-  "shuffleReadRecords" : 0,
-  "shuffleWriteBytes" : 0,
-  "shuffleWriteRecords" : 0,
-  "memoryBytesSpilled" : 0,
-  "diskBytesSpilled" : 0,
-  "name" : "count at <console>:17",
-  "details" : "org.apache.spark.rdd.RDD.count(RDD.scala:910)\n$line19.$read$$iwC$$iwC$$iwC$$iwC.<init>(<console>:17)\n$line19.$read$$iwC$$iwC$$iwC.<init>(<console>:22)\n$line19.$read$$iwC$$iwC.<init>(<console>:24)\n$line19.$read$$iwC.<init>(<console>:26)\n$line19.$read.<init>(<console>:28)\n$line19.$read$.<init>(<console>:32)\n$line19.$read$.<clinit>(<console>)\n$line19.$eval$.<init>(<console>:7)\n$line19.$eval$.<clinit>(<console>)\n$line19.$eval.$print(<console>)\nsun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\nsun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)\nsun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\njava.lang.reflect.Method.invoke(Method.java:606)\norg.apache.spark.repl.SparkIMain$ReadEvalPrint.call(SparkIMain.scala:852)\norg.apache.spark.repl.SparkIMain$Request.loadAndRun(SparkIMain.scala:1125)\norg.apache.spark.repl.SparkIMain.loadAndRunReq$1(SparkIMain.scala:674)\norg.apache.spark.repl.SparkIMain.interpret(SparkIMain.scala:705)\norg.apache.spark.repl.SparkIMain.interpret(SparkIMain.scala:669)",
-  "schedulingPool" : "default",
-  "accumulatorUpdates" : [ ]
-}, {
-  "status" : "COMPLETE",
-  "stageId" : 1,
-  "attemptId" : 0,
-  "numActiveTasks" : 0,
-  "numCompleteTasks" : 8,
-  "numFailedTasks" : 0,
-  "executorRunTime" : 3476,
-  "inputBytes" : 28000128,
-  "inputRecords" : 0,
-  "outputBytes" : 0,
-  "outputRecords" : 0,
-  "shuffleReadBytes" : 0,
-  "shuffleReadRecords" : 0,
-  "shuffleWriteBytes" : 13180,
-  "shuffleWriteRecords" : 0,
-  "memoryBytesSpilled" : 0,
-  "diskBytesSpilled" : 0,
-  "name" : "map at <console>:14",
-  "details" : "org.apache.spark.rdd.RDD.map(RDD.scala:271)\n$line10.$read$$iwC$$iwC$$iwC$$iwC.<init>(<console>:14)\n$line10.$read$$iwC$$iwC$$iwC.<init>(<console>:19)\n$line10.$read$$iwC$$iwC.<init>(<console>:21)\n$line10.$read$$iwC.<init>(<console>:23)\n$line10.$read.<init>(<console>:25)\n$line10.$read$.<init>(<console>:29)\n$line10.$read$.<clinit>(<console>)\n$line10.$eval$.<init>(<console>:7)\n$line10.$eval$.<clinit>(<console>)\n$line10.$eval.$print(<console>)\nsun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\nsun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)\nsun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\njava.lang.reflect.Method.invoke(Method.java:606)\norg.apache.spark.repl.SparkIMain$ReadEvalPrint.call(SparkIMain.scala:852)\norg.apache.spark.repl.SparkIMain$Request.loadAndRun(SparkIMain.scala:1125)\norg.apache.spark.repl.SparkIMain.loadAndRunReq$1(SparkIMain.scala:674)\norg.apache.spark.repl.SparkIMain.interpret(SparkIMain.scala:705)\norg.apache.spark.repl.SparkIMain.interpret(SparkIMain.scala:669)",
-  "schedulingPool" : "default",
-  "accumulatorUpdates" : [ ]
-}, {
-  "status" : "COMPLETE",
-  "stageId" : 0,
-  "attemptId" : 0,
-  "numActiveTasks" : 0,
-  "numCompleteTasks" : 8,
-  "numFailedTasks" : 0,
-  "executorRunTime" : 4338,
-  "inputBytes" : 0,
-  "inputRecords" : 0,
-  "outputBytes" : 0,
-  "outputRecords" : 0,
-  "shuffleReadBytes" : 0,
-  "shuffleReadRecords" : 0,
-  "shuffleWriteBytes" : 0,
-  "shuffleWriteRecords" : 0,
-  "memoryBytesSpilled" : 0,
-  "diskBytesSpilled" : 0,
-  "name" : "count at <console>:15",
-  "details" : "org.apache.spark.rdd.RDD.count(RDD.scala:910)\n$line9.$read$$iwC$$iwC$$iwC$$iwC.<init>(<console>:15)\n$line9.$read$$iwC$$iwC$$iwC.<init>(<console>:20)\n$line9.$read$$iwC$$iwC.<init>(<console>:22)\n$line9.$read$$iwC.<init>(<console>:24)\n$line9.$read.<init>(<console>:26)\n$line9.$read$.<init>(<console>:30)\n$line9.$read$.<clinit>(<console>)\n$line9.$eval$.<init>(<console>:7)\n$line9.$eval$.<clinit>(<console>)\n$line9.$eval.$print(<console>)\nsun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\nsun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)\nsun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\njava.lang.reflect.Method.invoke(Method.java:606)\norg.apache.spark.repl.SparkIMain$ReadEvalPrint.call(SparkIMain.scala:852)\norg.apache.spark.repl.SparkIMain$Request.loadAndRun(SparkIMain.scala:1125)\norg.apache.spark.repl.SparkIMain.loadAndRunReq$1(SparkIMain.scala:674)\norg.apache.spark.repl.SparkIMain.interpret(SparkIMain.scala:705)\norg.apache.spark.repl.SparkIMain.interpret(SparkIMain.scala:669)",
-  "schedulingPool" : "default",
-  "accumulatorUpdates" : [ ]
-}, {
-  "status" : "FAILED",
-  "stageId" : 2,
-  "attemptId" : 0,
-  "numActiveTasks" : 0,
-  "numCompleteTasks" : 7,
-  "numFailedTasks" : 1,
-  "executorRunTime" : 278,
-  "inputBytes" : 0,
-  "inputRecords" : 0,
-  "outputBytes" : 0,
-  "outputRecords" : 0,
-  "shuffleReadBytes" : 0,
-  "shuffleReadRecords" : 0,
-  "shuffleWriteBytes" : 0,
-  "shuffleWriteRecords" : 0,
-  "memoryBytesSpilled" : 0,
-  "diskBytesSpilled" : 0,
-  "name" : "count at <console>:20",
-  "details" : "org.apache.spark.rdd.RDD.count(RDD.scala:910)\n$line11.$read$$iwC$$iwC$$iwC$$iwC.<init>(<console>:20)\n$line11.$read$$iwC$$iwC$$iwC.<init>(<console>:25)\n$line11.$read$$iwC$$iwC.<init>(<console>:27)\n$line11.$read$$iwC.<init>(<console>:29)\n$line11.$read.<init>(<console>:31)\n$line11.$read$.<init>(<console>:35)\n$line11.$read$.<clinit>(<console>)\n$line11.$eval$.<init>(<console>:7)\n$line11.$eval$.<clinit>(<console>)\n$line11.$eval.$print(<console>)\nsun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\nsun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)\nsun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\njava.lang.reflect.Method.invoke(Method.java:606)\norg.apache.spark.repl.SparkIMain$ReadEvalPrint.call(SparkIMain.scala:852)\norg.apache.spark.repl.SparkIMain$Request.loadAndRun(SparkIMain.scala:1125)\norg.apache.spark.repl.SparkIMain.loadAndRunReq$1(SparkIMain.scala:674)\norg.apache.spark.repl.SparkIMain.interpret(SparkIMain.scala:705)\norg.apache.spark.repl.SparkIMain.interpret(SparkIMain.scala:669)",
-  "schedulingPool" : "default",
-  "accumulatorUpdates" : [ ]
-} ]
-\ No newline at end of file
diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages?status=complete/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages?status=complete/json_expectation
deleted file mode 100644
index 31ac9beea8..0000000000
--- a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages?status=complete/json_expectation
+++ /dev/null
@@ -1,67 +0,0 @@
-[ {
-  "status" : "COMPLETE",
-  "stageId" : 3,
-  "attemptId" : 0,
-  "numActiveTasks" : 0,
-  "numCompleteTasks" : 8,
-  "numFailedTasks" : 0,
-  "executorRunTime" : 162,
-  "inputBytes" : 160,
-  "inputRecords" : 0,
-  "outputBytes" : 0,
-  "outputRecords" : 0,
-  "shuffleReadBytes" : 0,
-  "shuffleReadRecords" : 0,
-  "shuffleWriteBytes" : 0,
-  "shuffleWriteRecords" : 0,
-  "memoryBytesSpilled" : 0,
-  "diskBytesSpilled" : 0,
-  "name" : "count at <console>:17",
-  "details" : "org.apache.spark.rdd.RDD.count(RDD.scala:910)\n$line19.$read$$iwC$$iwC$$iwC$$iwC.<init>(<console>:17)\n$line19.$read$$iwC$$iwC$$iwC.<init>(<console>:22)\n$line19.$read$$iwC$$iwC.<init>(<console>:24)\n$line19.$read$$iwC.<init>(<console>:26)\n$line19.$read.<init>(<console>:28)\n$line19.$read$.<init>(<console>:32)\n$line19.$read$.<clinit>(<console>)\n$line19.$eval$.<init>(<console>:7)\n$line19.$eval$.<clinit>(<console>)\n$line19.$eval.$print(<console>)\nsun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\nsun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)\nsun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\njava.lang.reflect.Method.invoke(Method.java:606)\norg.apache.spark.repl.SparkIMain$ReadEvalPrint.call(SparkIMain.scala:852)\norg.apache.spark.repl.SparkIMain$Request.loadAndRun(SparkIMain.scala:1125)\norg.apache.spark.repl.SparkIMain.loadAndRunReq$1(SparkIMain.scala:674)\norg.apache.spark.repl.SparkIMain.interpret(SparkIMain.scala:705)\norg.apache.spark.repl.SparkIMain.interpret(SparkIMain.scala:669)",
-  "schedulingPool" : "default",
-  "accumulatorUpdates" : [ ]
-}, {
-  "status" : "COMPLETE",
-  "stageId" : 1,
-  "attemptId" : 0,
-  "numActiveTasks" : 0,
-  "numCompleteTasks" : 8,
-  "numFailedTasks" : 0,
-  "executorRunTime" : 3476,
-  "inputBytes" : 28000128,
-  "inputRecords" : 0,
-  "outputBytes" : 0,
-  "outputRecords" : 0,
-  "shuffleReadBytes" : 0,
-  "shuffleReadRecords" : 0,
-  "shuffleWriteBytes" : 13180,
-  "shuffleWriteRecords" : 0,
-  "memoryBytesSpilled" : 0,
-  "diskBytesSpilled" : 0,
-  "name" : "map at <console>:14",
-  "details" : "org.apache.spark.rdd.RDD.map(RDD.scala:271)\n$line10.$read$$iwC$$iwC$$iwC$$iwC.<init>(<console>:14)\n$line10.$read$$iwC$$iwC$$iwC.<init>(<console>:19)\n$line10.$read$$iwC$$iwC.<init>(<console>:21)\n$line10.$read$$iwC.<init>(<console>:23)\n$line10.$read.<init>(<console>:25)\n$line10.$read$.<init>(<console>:29)\n$line10.$read$.<clinit>(<console>)\n$line10.$eval$.<init>(<console>:7)\n$line10.$eval$.<clinit>(<console>)\n$line10.$eval.$print(<console>)\nsun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\nsun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)\nsun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\njava.lang.reflect.Method.invoke(Method.java:606)\norg.apache.spark.repl.SparkIMain$ReadEvalPrint.call(SparkIMain.scala:852)\norg.apache.spark.repl.SparkIMain$Request.loadAndRun(SparkIMain.scala:1125)\norg.apache.spark.repl.SparkIMain.loadAndRunReq$1(SparkIMain.scala:674)\norg.apache.spark.repl.SparkIMain.interpret(SparkIMain.scala:705)\norg.apache.spark.repl.SparkIMain.interpret(SparkIMain.scala:669)",
-  "schedulingPool" : "default",
-  "accumulatorUpdates" : [ ]
-}, {
-  "status" : "COMPLETE",
-  "stageId" : 0,
-  "attemptId" : 0,
-  "numActiveTasks" : 0,
-  "numCompleteTasks" : 8,
-  "numFailedTasks" : 0,
-  "executorRunTime" : 4338,
-  "inputBytes" : 0,
-  "inputRecords" : 0,
-  "outputBytes" : 0,
-  "outputRecords" : 0,
-  "shuffleReadBytes" : 0,
-  "shuffleReadRecords" : 0,
-  "shuffleWriteBytes" : 0,
-  "shuffleWriteRecords" : 0,
-  "memoryBytesSpilled" : 0,
-  "diskBytesSpilled" : 0,
-  "name" : "count at <console>:15",
-  "details" : "org.apache.spark.rdd.RDD.count(RDD.scala:910)\n$line9.$read$$iwC$$iwC$$iwC$$iwC.<init>(<console>:15)\n$line9.$read$$iwC$$iwC$$iwC.<init>(<console>:20)\n$line9.$read$$iwC$$iwC.<init>(<console>:22)\n$line9.$read$$iwC.<init>(<console>:24)\n$line9.$read.<init>(<console>:26)\n$line9.$read$.<init>(<console>:30)\n$line9.$read$.<clinit>(<console>)\n$line9.$eval$.<init>(<console>:7)\n$line9.$eval$.<clinit>(<console>)\n$line9.$eval.$print(<console>)\nsun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\nsun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)\nsun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\njava.lang.reflect.Method.invoke(Method.java:606)\norg.apache.spark.repl.SparkIMain$ReadEvalPrint.call(SparkIMain.scala:852)\norg.apache.spark.repl.SparkIMain$Request.loadAndRun(SparkIMain.scala:1125)\norg.apache.spark.repl.SparkIMain.loadAndRunReq$1(SparkIMain.scala:674)\norg.apache.spark.repl.SparkIMain.interpret(SparkIMain.scala:705)\norg.apache.spark.repl.SparkIMain.interpret(SparkIMain.scala:669)",
-  "schedulingPool" : "default",
-  "accumulatorUpdates" : [ ]
-} ]
-\ No newline at end of file
diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages?status=failed/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages?status=failed/json_expectation
deleted file mode 100644
index bff6a4f69d..0000000000
--- a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages?status=failed/json_expectation
+++ /dev/null
@@ -1,23 +0,0 @@
-[ {
-  "status" : "FAILED",
-  "stageId" : 2,
-  "attemptId" : 0,
-  "numActiveTasks" : 0,
-  "numCompleteTasks" : 7,
-  "numFailedTasks" : 1,
-  "executorRunTime" : 278,
-  "inputBytes" : 0,
-  "inputRecords" : 0,
-  "outputBytes" : 0,
-  "outputRecords" : 0,
-  "shuffleReadBytes" : 0,
-  "shuffleReadRecords" : 0,
-  "shuffleWriteBytes" : 0,
-  "shuffleWriteRecords" : 0,
-  "memoryBytesSpilled" : 0,
-  "diskBytesSpilled" : 0,
-  "name" : "count at <console>:20",
-  "details" : "org.apache.spark.rdd.RDD.count(RDD.scala:910)\n$line11.$read$$iwC$$iwC$$iwC$$iwC.<init>(<console>:20)\n$line11.$read$$iwC$$iwC$$iwC.<init>(<console>:25)\n$line11.$read$$iwC$$iwC.<init>(<console>:27)\n$line11.$read$$iwC.<init>(<console>:29)\n$line11.$read.<init>(<console>:31)\n$line11.$read$.<init>(<console>:35)\n$line11.$read$.<clinit>(<console>)\n$line11.$eval$.<init>(<console>:7)\n$line11.$eval$.<clinit>(<console>)\n$line11.$eval.$print(<console>)\nsun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\nsun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)\nsun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\njava.lang.reflect.Method.invoke(Method.java:606)\norg.apache.spark.repl.SparkIMain$ReadEvalPrint.call(SparkIMain.scala:852)\norg.apache.spark.repl.SparkIMain$Request.loadAndRun(SparkIMain.scala:1125)\norg.apache.spark.repl.SparkIMain.loadAndRunReq$1(SparkIMain.scala:674)\norg.apache.spark.repl.SparkIMain.interpret(SparkIMain.scala:705)\norg.apache.spark.repl.SparkIMain.interpret(SparkIMain.scala:669)",
-  "schedulingPool" : "default",
-  "accumulatorUpdates" : [ ]
-} ]
-\ No newline at end of file
diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/storage/rdd/0/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/storage/rdd/0/json_expectation
deleted file mode 100644
index 38b5328ffb..0000000000
--- a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/storage/rdd/0/json_expectation
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-  "id" : 0,
-  "name" : "0",
-  "numPartitions" : 8,
-  "numCachedPartitions" : 8,
-  "storageLevel" : "Memory Deserialized 1x Replicated",
-  "memoryUsed" : 28000128,
-  "diskUsed" : 0,
-  "dataDistribution" : [ {
-    "address" : "localhost:57971",
-    "memoryUsed" : 28000128,
-    "memoryRemaining" : 250302428,
-    "diskUsed" : 0
-  } ],
-  "partitions" : [ {
-    "blockName" : "rdd_0_0",
-    "storageLevel" : "Memory Deserialized 1x Replicated",
-    "memoryUsed" : 3500016,
-    "diskUsed" : 0,
-    "executors" : [ "localhost:57971" ]
-  }, {
-    "blockName" : "rdd_0_1",
-    "storageLevel" : "Memory Deserialized 1x Replicated",
-    "memoryUsed" : 3500016,
-    "diskUsed" : 0,
-    "executors" : [ "localhost:57971" ]
-  }, {
-    "blockName" : "rdd_0_2",
-    "storageLevel" : "Memory Deserialized 1x Replicated",
-    "memoryUsed" : 3500016,
-    "diskUsed" : 0,
-    "executors" : [ "localhost:57971" ]
-  }, {
-    "blockName" : "rdd_0_3",
-    "storageLevel" : "Memory Deserialized 1x Replicated",
-    "memoryUsed" : 3500016,
-    "diskUsed" : 0,
-    "executors" : [ "localhost:57971" ]
-  }, {
-    "blockName" : "rdd_0_4",
-    "storageLevel" : "Memory Deserialized 1x Replicated",
-    "memoryUsed" : 3500016,
-    "diskUsed" : 0,
-    "executors" : [ "localhost:57971" ]
-  }, {
-    "blockName" : "rdd_0_5",
-    "storageLevel" : "Memory Deserialized 1x Replicated",
-    "memoryUsed" : 3500016,
-    "diskUsed" : 0,
-    "executors" : [ "localhost:57971" ]
-  }, {
-    "blockName" : "rdd_0_6",
-    "storageLevel" : "Memory Deserialized 1x Replicated",
-    "memoryUsed" : 3500016,
-    "diskUsed" : 0,
-    "executors" : [ "localhost:57971" ]
-  }, {
-    "blockName" : "rdd_0_7",
-    "storageLevel" : "Memory Deserialized 1x Replicated",
-    "memoryUsed" : 3500016,
-    "diskUsed" : 0,
-    "executors" : [ "localhost:57971" ]
-  } ]
-}
-\ No newline at end of file
diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/storage/rdd/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/storage/rdd/json_expectation
deleted file mode 100644
index f79a31022d..0000000000
--- a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/storage/rdd/json_expectation
+++ /dev/null
@@ -1,9 +0,0 @@
-[ {
-  "id" : 0,
-  "name" : "0",
-  "numPartitions" : 8,
-  "numCachedPartitions" : 8,
-  "storageLevel" : "Memory Deserialized 1x Replicated",
-  "memoryUsed" : 28000128,
-  "diskUsed" : 0
-} ]
-\ No newline at end of file