Revert "[SPARK-3454] separate json endpoints for data in the UI"

This reverts commit d49735800db27239c11478aac4b0f2ec9df91a3f.

The commit broke Spark on Windows.

33 files changed, 0 insertions, 4977 deletions

diff --git a/core/src/test/resources/HistoryServerExpectations/applications/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/json_expectation
deleted file mode 100644
index 6101177e4b..0000000000
--- a/core/src/test/resources/HistoryServerExpectations/applications/json_expectation
+++ /dev/null
@@ -1,53 +0,0 @@
-[ {
-  "id" : "local-1427397477963",
-  "name" : "Spark shell",
-  "attempts" : [ {
-    "startTime" : "2015-03-26T19:17:57.184GMT",
-    "endTime" : "2015-03-26T19:20:02.949GMT",
-    "sparkUser" : "irashid",
-    "completed" : true
-  } ]
-}, {
-  "id" : "local-1426533911241",
-  "name" : "Spark shell",
-  "attempts" : [ {
-    "attemptId" : "2",
-    "startTime" : "2015-03-17T23:11:50.242GMT",
-    "endTime" : "2015-03-17T23:12:25.177GMT",
-    "sparkUser" : "irashid",
-    "completed" : true
-  }, {
-    "attemptId" : "1",
-    "startTime" : "2015-03-16T19:25:10.242GMT",
-    "endTime" : "2015-03-16T19:25:45.177GMT",
-    "sparkUser" : "irashid",
-    "completed" : true
-  } ]
-}, {
-  "id" : "local-1425081759269",
-  "name" : "Spark shell",
-  "attempts" : [ {
-    "startTime" : "2015-02-28T00:02:38.277GMT",
-    "endTime" : "2015-02-28T00:02:46.912GMT",
-    "sparkUser" : "irashid",
-    "completed" : true
-  } ]
-}, {
-  "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
-  } ]
-}, {
-  "id" : "local-1422981759269",
-  "name" : "Spark shell",
-  "attempts" : [ {
-    "startTime" : "2015-02-03T16:42:38.277GMT",
-    "endTime" : "2015-02-03T16:42:46.912GMT",
-    "sparkUser" : "irashid",
-    "completed" : true
-  } ]
-} ]
\ No newline at end of file
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
diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/1/jobs/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/1/jobs/json_expectation
deleted file mode 100644
index 2e92e1fa0e..0000000000
--- a/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/1/jobs/json_expectation
+++ /dev/null
@@ -1,15 +0,0 @@
-[ {
-  "jobId" : 0,
-  "name" : "foreach 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-1426533911241/1/stages/0/0/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/1/stages/0/0/json_expectation
deleted file mode 100644
index 32d5731676..0000000000
--- a/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/1/stages/0/0/json_expectation
+++ /dev/null
@@ -1,242 +0,0 @@
-{
-  "status" : "COMPLETE",
-  "stageId" : 0,
-  "attemptId" : 0,
-  "numActiveTasks" : 0,
-  "numCompleteTasks" : 8,
-  "numFailedTasks" : 0,
-  "executorRunTime" : 120,
-  "inputBytes" : 0,
-  "inputRecords" : 0,
-  "outputBytes" : 0,
-  "outputRecords" : 0,
-  "shuffleReadBytes" : 0,
-  "shuffleReadRecords" : 0,
-  "shuffleWriteBytes" : 0,
-  "shuffleWriteRecords" : 0,
-  "memoryBytesSpilled" : 0,
-  "diskBytesSpilled" : 0,
-  "name" : "foreach at <console>:15",
-  "details" : "org.apache.spark.rdd.RDD.foreach(RDD.scala:765)\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:62)\nsun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\njava.lang.reflect.Method.invoke(Method.java:483)\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" : [ {
-    "id" : 1,
-    "name" : "my counter",
-    "value" : "5050"
-  } ],
-  "tasks" : {
-    "2" : {
-      "taskId" : 2,
-      "index" : 2,
-      "attempt" : 0,
-      "launchTime" : "2015-03-16T19:25:36.522GMT",
-      "executorId" : "<driver>",
-      "host" : "localhost",
-      "taskLocality" : "PROCESS_LOCAL",
-      "speculative" : false,
-      "accumulatorUpdates" : [ {
-        "id" : 1,
-        "name" : "my counter",
-        "update" : "378",
-        "value" : "378"
-      } ],
-      "taskMetrics" : {
-        "executorDeserializeTime" : 13,
-        "executorRunTime" : 15,
-        "resultSize" : 697,
-        "jvmGcTime" : 0,
-        "resultSerializationTime" : 2,
-        "memoryBytesSpilled" : 0,
-        "diskBytesSpilled" : 0
-      }
-    },
-    "5" : {
-      "taskId" : 5,
-      "index" : 5,
-      "attempt" : 0,
-      "launchTime" : "2015-03-16T19:25:36.523GMT",
-      "executorId" : "<driver>",
-      "host" : "localhost",
-      "taskLocality" : "PROCESS_LOCAL",
-      "speculative" : false,
-      "accumulatorUpdates" : [ {
-        "id" : 1,
-        "name" : "my counter",
-        "update" : "897",
-        "value" : "3750"
-      } ],
-      "taskMetrics" : {
-        "executorDeserializeTime" : 12,
-        "executorRunTime" : 15,
-        "resultSize" : 697,
-        "jvmGcTime" : 0,
-        "resultSerializationTime" : 2,
-        "memoryBytesSpilled" : 0,
-        "diskBytesSpilled" : 0
-      }
-    },
-    "4" : {
-      "taskId" : 4,
-      "index" : 4,
-      "attempt" : 0,
-      "launchTime" : "2015-03-16T19:25:36.522GMT",
-      "executorId" : "<driver>",
-      "host" : "localhost",
-      "taskLocality" : "PROCESS_LOCAL",
-      "speculative" : false,
-      "accumulatorUpdates" : [ {
-        "id" : 1,
-        "name" : "my counter",
-        "update" : "678",
-        "value" : "2853"
-      } ],
-      "taskMetrics" : {
-        "executorDeserializeTime" : 12,
-        "executorRunTime" : 15,
-        "resultSize" : 697,
-        "jvmGcTime" : 0,
-        "resultSerializationTime" : 1,
-        "memoryBytesSpilled" : 0,
-        "diskBytesSpilled" : 0
-      }
-    },
-    "7" : {
-      "taskId" : 7,
-      "index" : 7,
-      "attempt" : 0,
-      "launchTime" : "2015-03-16T19:25:36.524GMT",
-      "executorId" : "<driver>",
-      "host" : "localhost",
-      "taskLocality" : "PROCESS_LOCAL",
-      "speculative" : false,
-      "accumulatorUpdates" : [ {
-        "id" : 1,
-        "name" : "my counter",
-        "update" : "1222",
-        "value" : "4972"
-      } ],
-      "taskMetrics" : {
-        "executorDeserializeTime" : 12,
-        "executorRunTime" : 15,
-        "resultSize" : 697,
-        "jvmGcTime" : 0,
-        "resultSerializationTime" : 2,
-        "memoryBytesSpilled" : 0,
-        "diskBytesSpilled" : 0
-      }
-    },
-    "1" : {
-      "taskId" : 1,
-      "index" : 1,
-      "attempt" : 0,
-      "launchTime" : "2015-03-16T19:25:36.521GMT",
-      "executorId" : "<driver>",
-      "host" : "localhost",
-      "taskLocality" : "PROCESS_LOCAL",
-      "speculative" : false,
-      "accumulatorUpdates" : [ {
-        "id" : 1,
-        "name" : "my counter",
-        "update" : "247",
-        "value" : "2175"
-      } ],
-      "taskMetrics" : {
-        "executorDeserializeTime" : 14,
-        "executorRunTime" : 15,
-        "resultSize" : 697,
-        "jvmGcTime" : 0,
-        "resultSerializationTime" : 2,
-        "memoryBytesSpilled" : 0,
-        "diskBytesSpilled" : 0
-      }
-    },
-    "3" : {
-      "taskId" : 3,
-      "index" : 3,
-      "attempt" : 0,
-      "launchTime" : "2015-03-16T19:25:36.522GMT",
-      "executorId" : "<driver>",
-      "host" : "localhost",
-      "taskLocality" : "PROCESS_LOCAL",
-      "speculative" : false,
-      "accumulatorUpdates" : [ {
-        "id" : 1,
-        "name" : "my counter",
-        "update" : "572",
-        "value" : "950"
-      } ],
-      "taskMetrics" : {
-        "executorDeserializeTime" : 13,
-        "executorRunTime" : 15,
-        "resultSize" : 697,
-        "jvmGcTime" : 0,
-        "resultSerializationTime" : 2,
-        "memoryBytesSpilled" : 0,
-        "diskBytesSpilled" : 0
-      }
-    },
-    "6" : {
-      "taskId" : 6,
-      "index" : 6,
-      "attempt" : 0,
-      "launchTime" : "2015-03-16T19:25:36.523GMT",
-      "executorId" : "<driver>",
-      "host" : "localhost",
-      "taskLocality" : "PROCESS_LOCAL",
-      "speculative" : false,
-      "accumulatorUpdates" : [ {
-        "id" : 1,
-        "name" : "my counter",
-        "update" : "978",
-        "value" : "1928"
-      } ],
-      "taskMetrics" : {
-        "executorDeserializeTime" : 12,
-        "executorRunTime" : 15,
-        "resultSize" : 697,
-        "jvmGcTime" : 0,
-        "resultSerializationTime" : 2,
-        "memoryBytesSpilled" : 0,
-        "diskBytesSpilled" : 0
-      }
-    },
-    "0" : {
-      "taskId" : 0,
-      "index" : 0,
-      "attempt" : 0,
-      "launchTime" : "2015-03-16T19:25:36.515GMT",
-      "executorId" : "<driver>",
-      "host" : "localhost",
-      "taskLocality" : "PROCESS_LOCAL",
-      "speculative" : false,
-      "accumulatorUpdates" : [ {
-        "id" : 1,
-        "name" : "my counter",
-        "update" : "78",
-        "value" : "5050"
-      } ],
-      "taskMetrics" : {
-        "executorDeserializeTime" : 14,
-        "executorRunTime" : 15,
-        "resultSize" : 697,
-        "jvmGcTime" : 0,
-        "resultSerializationTime" : 2,
-        "memoryBytesSpilled" : 0,
-        "diskBytesSpilled" : 0
-      }
-    }
-  },
-  "executorSummary" : {
-    "<driver>" : {
-      "taskTime" : 418,
-      "failedTasks" : 0,
-      "succeededTasks" : 8,
-      "inputBytes" : 0,
-      "outputBytes" : 0,
-      "shuffleRead" : 0,
-      "shuffleWrite" : 0,
-      "memoryBytesSpilled" : 0,
-      "diskBytesSpilled" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/1/stages/0/0/taskList/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/1/stages/0/0/taskList/json_expectation
deleted file mode 100644
index c3febc5fc9..0000000000
--- a/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/1/stages/0/0/taskList/json_expectation
+++ /dev/null
@@ -1,193 +0,0 @@
-[ {
-  "taskId" : 0,
-  "index" : 0,
-  "attempt" : 0,
-  "launchTime" : "2015-03-16T19:25:36.515GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ {
-    "id" : 1,
-    "name" : "my counter",
-    "update" : "78",
-    "value" : "5050"
-  } ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 14,
-    "executorRunTime" : 15,
-    "resultSize" : 697,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 2,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0
-  }
-}, {
-  "taskId" : 1,
-  "index" : 1,
-  "attempt" : 0,
-  "launchTime" : "2015-03-16T19:25:36.521GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ {
-    "id" : 1,
-    "name" : "my counter",
-    "update" : "247",
-    "value" : "2175"
-  } ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 14,
-    "executorRunTime" : 15,
-    "resultSize" : 697,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 2,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0
-  }
-}, {
-  "taskId" : 2,
-  "index" : 2,
-  "attempt" : 0,
-  "launchTime" : "2015-03-16T19:25:36.522GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ {
-    "id" : 1,
-    "name" : "my counter",
-    "update" : "378",
-    "value" : "378"
-  } ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 13,
-    "executorRunTime" : 15,
-    "resultSize" : 697,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 2,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0
-  }
-}, {
-  "taskId" : 3,
-  "index" : 3,
-  "attempt" : 0,
-  "launchTime" : "2015-03-16T19:25:36.522GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ {
-    "id" : 1,
-    "name" : "my counter",
-    "update" : "572",
-    "value" : "950"
-  } ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 13,
-    "executorRunTime" : 15,
-    "resultSize" : 697,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 2,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0
-  }
-}, {
-  "taskId" : 4,
-  "index" : 4,
-  "attempt" : 0,
-  "launchTime" : "2015-03-16T19:25:36.522GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ {
-    "id" : 1,
-    "name" : "my counter",
-    "update" : "678",
-    "value" : "2853"
-  } ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 12,
-    "executorRunTime" : 15,
-    "resultSize" : 697,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 1,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0
-  }
-}, {
-  "taskId" : 5,
-  "index" : 5,
-  "attempt" : 0,
-  "launchTime" : "2015-03-16T19:25:36.523GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ {
-    "id" : 1,
-    "name" : "my counter",
-    "update" : "897",
-    "value" : "3750"
-  } ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 12,
-    "executorRunTime" : 15,
-    "resultSize" : 697,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 2,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0
-  }
-}, {
-  "taskId" : 6,
-  "index" : 6,
-  "attempt" : 0,
-  "launchTime" : "2015-03-16T19:25:36.523GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ {
-    "id" : 1,
-    "name" : "my counter",
-    "update" : "978",
-    "value" : "1928"
-  } ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 12,
-    "executorRunTime" : 15,
-    "resultSize" : 697,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 2,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0
-  }
-}, {
-  "taskId" : 7,
-  "index" : 7,
-  "attempt" : 0,
-  "launchTime" : "2015-03-16T19:25:36.524GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ {
-    "id" : 1,
-    "name" : "my counter",
-    "update" : "1222",
-    "value" : "4972"
-  } ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 12,
-    "executorRunTime" : 15,
-    "resultSize" : 697,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 2,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0
-  }
-} ]
\ No newline at end of file
diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/1/stages/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/1/stages/json_expectation
deleted file mode 100644
index 79ccacd309..0000000000
--- a/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/1/stages/json_expectation
+++ /dev/null
@@ -1,27 +0,0 @@
-[ {
-  "status" : "COMPLETE",
-  "stageId" : 0,
-  "attemptId" : 0,
-  "numActiveTasks" : 0,
-  "numCompleteTasks" : 8,
-  "numFailedTasks" : 0,
-  "executorRunTime" : 120,
-  "inputBytes" : 0,
-  "inputRecords" : 0,
-  "outputBytes" : 0,
-  "outputRecords" : 0,
-  "shuffleReadBytes" : 0,
-  "shuffleReadRecords" : 0,
-  "shuffleWriteBytes" : 0,
-  "shuffleWriteRecords" : 0,
-  "memoryBytesSpilled" : 0,
-  "diskBytesSpilled" : 0,
-  "name" : "foreach at <console>:15",
-  "details" : "org.apache.spark.rdd.RDD.foreach(RDD.scala:765)\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:62)\nsun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\njava.lang.reflect.Method.invoke(Method.java:483)\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" : [ {
-    "id" : 1,
-    "name" : "my counter",
-    "value" : "5050"
-  } ]
-} ]
\ No newline at end of file
diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/2/jobs/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/2/jobs/json_expectation
deleted file mode 100644
index 2e92e1fa0e..0000000000
--- a/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/2/jobs/json_expectation
+++ /dev/null
@@ -1,15 +0,0 @@
-[ {
-  "jobId" : 0,
-  "name" : "foreach 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-1426533911241/2/stages/0/0/taskList/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/2/stages/0/0/taskList/json_expectation
deleted file mode 100644
index 56d667d889..0000000000
--- a/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/2/stages/0/0/taskList/json_expectation
+++ /dev/null
@@ -1,193 +0,0 @@
-[ {
-  "taskId" : 0,
-  "index" : 0,
-  "attempt" : 0,
-  "launchTime" : "2015-03-17T23:12:16.515GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ {
-    "id" : 1,
-    "name" : "my counter",
-    "update" : "78",
-    "value" : "5050"
-  } ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 14,
-    "executorRunTime" : 15,
-    "resultSize" : 697,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 2,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0
-  }
-}, {
-  "taskId" : 1,
-  "index" : 1,
-  "attempt" : 0,
-  "launchTime" : "2015-03-17T23:12:16.521GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ {
-    "id" : 1,
-    "name" : "my counter",
-    "update" : "247",
-    "value" : "2175"
-  } ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 14,
-    "executorRunTime" : 15,
-    "resultSize" : 697,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 2,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0
-  }
-}, {
-  "taskId" : 2,
-  "index" : 2,
-  "attempt" : 0,
-  "launchTime" : "2015-03-17T23:12:16.522GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ {
-    "id" : 1,
-    "name" : "my counter",
-    "update" : "378",
-    "value" : "378"
-  } ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 13,
-    "executorRunTime" : 15,
-    "resultSize" : 697,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 2,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0
-  }
-}, {
-  "taskId" : 3,
-  "index" : 3,
-  "attempt" : 0,
-  "launchTime" : "2015-03-17T23:12:16.522GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ {
-    "id" : 1,
-    "name" : "my counter",
-    "update" : "572",
-    "value" : "950"
-  } ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 13,
-    "executorRunTime" : 15,
-    "resultSize" : 697,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 2,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0
-  }
-}, {
-  "taskId" : 4,
-  "index" : 4,
-  "attempt" : 0,
-  "launchTime" : "2015-03-17T23:12:16.522GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ {
-    "id" : 1,
-    "name" : "my counter",
-    "update" : "678",
-    "value" : "2853"
-  } ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 12,
-    "executorRunTime" : 15,
-    "resultSize" : 697,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 1,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0
-  }
-}, {
-  "taskId" : 5,
-  "index" : 5,
-  "attempt" : 0,
-  "launchTime" : "2015-03-17T23:12:16.523GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ {
-    "id" : 1,
-    "name" : "my counter",
-    "update" : "897",
-    "value" : "3750"
-  } ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 12,
-    "executorRunTime" : 15,
-    "resultSize" : 697,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 2,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0
-  }
-}, {
-  "taskId" : 6,
-  "index" : 6,
-  "attempt" : 0,
-  "launchTime" : "2015-03-17T23:12:16.523GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ {
-    "id" : 1,
-    "name" : "my counter",
-    "update" : "978",
-    "value" : "1928"
-  } ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 12,
-    "executorRunTime" : 15,
-    "resultSize" : 697,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 2,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0
-  }
-}, {
-  "taskId" : 7,
-  "index" : 7,
-  "attempt" : 0,
-  "launchTime" : "2015-03-17T23:12:16.524GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ {
-    "id" : 1,
-    "name" : "my counter",
-    "update" : "1222",
-    "value" : "4972"
-  } ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 12,
-    "executorRunTime" : 15,
-    "resultSize" : 697,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 2,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0
-  }
-} ]
\ No newline at end of file
diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/json_expectation
deleted file mode 100644
index 8f3d7160c7..0000000000
--- a/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/json_expectation
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "id" : "local-1426533911241",
-  "name" : "Spark shell",
-  "attempts" : [ {
-    "attemptId" : "2",
-    "startTime" : "2015-03-17T23:11:50.242GMT",
-    "endTime" : "2015-03-17T23:12:25.177GMT",
-    "sparkUser" : "irashid",
-    "completed" : true
-  }, {
-    "attemptId" : "1",
-    "startTime" : "2015-03-16T19:25:10.242GMT",
-    "endTime" : "2015-03-16T19:25:45.177GMT",
-    "sparkUser" : "irashid",
-    "completed" : true
-  } ]
-}
\ No newline at end of file
diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList/json_expectation
deleted file mode 100644
index 140c76d7e5..0000000000
--- a/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList/json_expectation
+++ /dev/null
@@ -1,481 +0,0 @@
-[ {
-  "taskId" : 5010,
-  "index" : 0,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.571GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 1,
-    "executorRunTime" : 7,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9598,
-      "writeTime" : 318464,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5011,
-  "index" : 1,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.571GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 1,
-    "executorRunTime" : 6,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9601,
-      "writeTime" : 271674,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5012,
-  "index" : 2,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.571GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 7,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9601,
-      "writeTime" : 274899,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5013,
-  "index" : 3,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.571GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 11,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9597,
-      "writeTime" : 315224,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5014,
-  "index" : 4,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.571GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 12,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9599,
-      "writeTime" : 316561,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5015,
-  "index" : 5,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.571GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 7,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9598,
-      "writeTime" : 269443,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5016,
-  "index" : 6,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.571GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 5,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9600,
-      "writeTime" : 275977,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5017,
-  "index" : 7,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.571GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 6,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9600,
-      "writeTime" : 267412,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5018,
-  "index" : 8,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.579GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 6,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9600,
-      "writeTime" : 310279,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5019,
-  "index" : 9,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.579GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 6,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9601,
-      "writeTime" : 319028,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5020,
-  "index" : 10,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.579GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 1,
-    "executorRunTime" : 6,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9601,
-      "writeTime" : 306724,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5021,
-  "index" : 11,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.579GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 6,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9599,
-      "writeTime" : 280729,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5022,
-  "index" : 12,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.579GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 6,
-    "executorRunTime" : 5,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9601,
-      "writeTime" : 273837,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5023,
-  "index" : 13,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.579GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 6,
-    "executorRunTime" : 5,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9602,
-      "writeTime" : 282108,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5024,
-  "index" : 14,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.586GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 6,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9604,
-      "writeTime" : 266308,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5025,
-  "index" : 15,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.586GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 8,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9602,
-      "writeTime" : 330830,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5026,
-  "index" : 16,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.586GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 5,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9598,
-      "writeTime" : 247775,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5027,
-  "index" : 17,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.586GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 1,
-    "executorRunTime" : 5,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9601,
-      "writeTime" : 289503,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5028,
-  "index" : 18,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.592GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 6,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9601,
-      "writeTime" : 355545,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5029,
-  "index" : 19,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.593GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 7,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9598,
-      "writeTime" : 339081,
-      "recordsWritten" : 100
-    }
-  }
-} ]
\ No newline at end of file
diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList?offset=10&length=50/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList?offset=10&length=50/json_expectation
deleted file mode 100644
index 0fa1ac28c9..0000000000
--- a/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList?offset=10&length=50/json_expectation
+++ /dev/null
@@ -1,1201 +0,0 @@
-[ {
-  "taskId" : 5020,
-  "index" : 10,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.579GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 1,
-    "executorRunTime" : 6,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9601,
-      "writeTime" : 306724,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5021,
-  "index" : 11,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.579GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 6,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9599,
-      "writeTime" : 280729,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5022,
-  "index" : 12,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.579GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 6,
-    "executorRunTime" : 5,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9601,
-      "writeTime" : 273837,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5023,
-  "index" : 13,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.579GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 6,
-    "executorRunTime" : 5,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9602,
-      "writeTime" : 282108,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5024,
-  "index" : 14,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.586GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 6,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9604,
-      "writeTime" : 266308,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5025,
-  "index" : 15,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.586GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 8,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9602,
-      "writeTime" : 330830,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5026,
-  "index" : 16,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.586GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 5,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9598,
-      "writeTime" : 247775,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5027,
-  "index" : 17,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.586GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 1,
-    "executorRunTime" : 5,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9601,
-      "writeTime" : 289503,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5028,
-  "index" : 18,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.592GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 6,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9601,
-      "writeTime" : 355545,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5029,
-  "index" : 19,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.593GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 7,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9598,
-      "writeTime" : 339081,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5030,
-  "index" : 20,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.593GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 9,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9600,
-      "writeTime" : 367295,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5031,
-  "index" : 21,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.593GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 9,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9597,
-      "writeTime" : 493701,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5032,
-  "index" : 22,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.593GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 1,
-    "executorRunTime" : 6,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9601,
-      "writeTime" : 345941,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5033,
-  "index" : 23,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.593GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 6,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9600,
-      "writeTime" : 301382,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5034,
-  "index" : 24,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.594GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 6,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9603,
-      "writeTime" : 340547,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5035,
-  "index" : 25,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.600GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 1,
-    "executorRunTime" : 5,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9602,
-      "writeTime" : 324374,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5036,
-  "index" : 26,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.600GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 6,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9603,
-      "writeTime" : 321083,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5037,
-  "index" : 27,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.601GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 7,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9600,
-      "writeTime" : 318662,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5038,
-  "index" : 28,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.601GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 1,
-    "executorRunTime" : 6,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9599,
-      "writeTime" : 334376,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5039,
-  "index" : 29,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.601GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 7,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9602,
-      "writeTime" : 287042,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5040,
-  "index" : 30,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.601GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 6,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9601,
-      "writeTime" : 332938,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5041,
-  "index" : 31,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.602GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 4,
-    "executorRunTime" : 5,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9603,
-      "writeTime" : 255099,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5042,
-  "index" : 32,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.602GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 1,
-    "executorRunTime" : 6,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9598,
-      "writeTime" : 297534,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5043,
-  "index" : 33,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.607GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 6,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9601,
-      "writeTime" : 265929,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5044,
-  "index" : 34,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.607GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 5,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9601,
-      "writeTime" : 279851,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5045,
-  "index" : 35,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.608GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 5,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9600,
-      "writeTime" : 278965,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5046,
-  "index" : 36,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.609GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 1,
-    "executorRunTime" : 5,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9599,
-      "writeTime" : 340518,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5047,
-  "index" : 37,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.609GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 6,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9597,
-      "writeTime" : 402877,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5048,
-  "index" : 38,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.609GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 7,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9600,
-      "writeTime" : 265447,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5049,
-  "index" : 39,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.611GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 3,
-    "executorRunTime" : 23,
-    "resultSize" : 930,
-    "jvmGcTime" : 16,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9598,
-      "writeTime" : 304745,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5050,
-  "index" : 40,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.615GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 24,
-    "resultSize" : 930,
-    "jvmGcTime" : 16,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9600,
-      "writeTime" : 302371,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5051,
-  "index" : 41,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.615GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 1,
-    "executorRunTime" : 25,
-    "resultSize" : 930,
-    "jvmGcTime" : 16,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9600,
-      "writeTime" : 296177,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5052,
-  "index" : 42,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.615GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 24,
-    "resultSize" : 930,
-    "jvmGcTime" : 16,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9601,
-      "writeTime" : 962033,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5053,
-  "index" : 43,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.616GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 26,
-    "resultSize" : 930,
-    "jvmGcTime" : 16,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9600,
-      "writeTime" : 310335,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5054,
-  "index" : 44,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.616GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 110,
-    "resultSize" : 930,
-    "jvmGcTime" : 22,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9602,
-      "writeTime" : 299315,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5055,
-  "index" : 45,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.617GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 25,
-    "resultSize" : 930,
-    "jvmGcTime" : 16,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9603,
-      "writeTime" : 307821,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5056,
-  "index" : 46,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.617GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 17,
-    "executorRunTime" : 7,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9604,
-      "writeTime" : 306911,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5057,
-  "index" : 47,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.639GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 1,
-    "executorRunTime" : 6,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9600,
-      "writeTime" : 274191,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5058,
-  "index" : 48,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.640GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 48,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9598,
-      "writeTime" : 10442141,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5059,
-  "index" : 49,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.641GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 7,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9601,
-      "writeTime" : 300675,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5060,
-  "index" : 50,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.642GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 24,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9602,
-      "writeTime" : 812196,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5061,
-  "index" : 51,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.642GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 1,
-    "executorRunTime" : 6,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9600,
-      "writeTime" : 313090,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5062,
-  "index" : 52,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.642GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 17,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9598,
-      "writeTime" : 1572828,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5063,
-  "index" : 53,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.643GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 7,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9597,
-      "writeTime" : 312481,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5064,
-  "index" : 54,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.646GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 13,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9600,
-      "writeTime" : 296976,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5065,
-  "index" : 55,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.650GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 7,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9600,
-      "writeTime" : 670271,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5066,
-  "index" : 56,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.650GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 10,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9601,
-      "writeTime" : 1240309,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5067,
-  "index" : 57,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.650GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 9,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9601,
-      "writeTime" : 678632,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5068,
-  "index" : 58,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.659GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 7,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9600,
-      "writeTime" : 302888,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5069,
-  "index" : 59,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.660GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 7,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9610,
-      "writeTime" : 383153,
-      "recordsWritten" : 100
-    }
-  }
-} ]
\ No newline at end of file
diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList?sortBy=-runtime/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList?sortBy=-runtime/json_expectation
deleted file mode 100644
index 63b131621c..0000000000
--- a/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList?sortBy=-runtime/json_expectation
+++ /dev/null
@@ -1,481 +0,0 @@
-[ {
-  "taskId" : 5186,
-  "index" : 176,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.880GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 147,
-    "resultSize" : 930,
-    "jvmGcTime" : 12,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9599,
-      "writeTime" : 317390,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5463,
-  "index" : 453,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:00.518GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 134,
-    "resultSize" : 930,
-    "jvmGcTime" : 5,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9598,
-      "writeTime" : 348853,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5461,
-  "index" : 451,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:00.516GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 134,
-    "resultSize" : 930,
-    "jvmGcTime" : 5,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9599,
-      "writeTime" : 413676,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5505,
-  "index" : 495,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:00.616GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 133,
-    "resultSize" : 930,
-    "jvmGcTime" : 11,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9602,
-      "writeTime" : 384212,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5672,
-  "index" : 662,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:01.016GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 1,
-    "executorRunTime" : 131,
-    "resultSize" : 930,
-    "jvmGcTime" : 4,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9602,
-      "writeTime" : 387955,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5865,
-  "index" : 855,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:01.514GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 131,
-    "resultSize" : 930,
-    "jvmGcTime" : 10,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9599,
-      "writeTime" : 1710924,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5415,
-  "index" : 405,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:00.389GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 130,
-    "resultSize" : 930,
-    "jvmGcTime" : 14,
-    "resultSerializationTime" : 1,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9597,
-      "writeTime" : 377101,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5462,
-  "index" : 452,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:00.518GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 128,
-    "resultSize" : 930,
-    "jvmGcTime" : 5,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9601,
-      "writeTime" : 306075,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5411,
-  "index" : 401,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:00.385GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 128,
-    "resultSize" : 930,
-    "jvmGcTime" : 14,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9602,
-      "writeTime" : 74684537,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5416,
-  "index" : 406,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:00.392GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 11,
-    "executorRunTime" : 123,
-    "resultSize" : 930,
-    "jvmGcTime" : 14,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9600,
-      "writeTime" : 365240,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5924,
-  "index" : 914,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:01.648GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 4,
-    "executorRunTime" : 121,
-    "resultSize" : 930,
-    "jvmGcTime" : 5,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9601,
-      "writeTime" : 335682,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5179,
-  "index" : 169,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.866GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 114,
-    "resultSize" : 930,
-    "jvmGcTime" : 5,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9601,
-      "writeTime" : 276876,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5243,
-  "index" : 233,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:00.018GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 113,
-    "resultSize" : 930,
-    "jvmGcTime" : 5,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9601,
-      "writeTime" : 12003053,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5054,
-  "index" : 44,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.616GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 110,
-    "resultSize" : 930,
-    "jvmGcTime" : 22,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9602,
-      "writeTime" : 299315,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5465,
-  "index" : 455,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:00.521GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 1,
-    "executorRunTime" : 108,
-    "resultSize" : 930,
-    "jvmGcTime" : 5,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9598,
-      "writeTime" : 318366,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5614,
-  "index" : 604,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:00.893GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 19,
-    "executorRunTime" : 108,
-    "resultSize" : 930,
-    "jvmGcTime" : 7,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9600,
-      "writeTime" : 309135,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5862,
-  "index" : 852,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:01.509GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 96,
-    "resultSize" : 930,
-    "jvmGcTime" : 5,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9598,
-      "writeTime" : 1052228,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5566,
-  "index" : 556,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:00.762GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 95,
-    "resultSize" : 930,
-    "jvmGcTime" : 6,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9600,
-      "writeTime" : 327089,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5567,
-  "index" : 557,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:00.768GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 94,
-    "resultSize" : 930,
-    "jvmGcTime" : 6,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9601,
-      "writeTime" : 374043,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5191,
-  "index" : 181,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.885GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 90,
-    "resultSize" : 930,
-    "jvmGcTime" : 5,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9598,
-      "writeTime" : 344199,
-      "recordsWritten" : 100
-    }
-  }
-} ]
\ No newline at end of file
diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList?sortBy=DECREASING_RUNTIME/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList?sortBy=DECREASING_RUNTIME/json_expectation
deleted file mode 100644
index 63b131621c..0000000000
--- a/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList?sortBy=DECREASING_RUNTIME/json_expectation
+++ /dev/null
@@ -1,481 +0,0 @@
-[ {
-  "taskId" : 5186,
-  "index" : 176,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.880GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 147,
-    "resultSize" : 930,
-    "jvmGcTime" : 12,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9599,
-      "writeTime" : 317390,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5463,
-  "index" : 453,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:00.518GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 134,
-    "resultSize" : 930,
-    "jvmGcTime" : 5,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9598,
-      "writeTime" : 348853,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5461,
-  "index" : 451,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:00.516GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 134,
-    "resultSize" : 930,
-    "jvmGcTime" : 5,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9599,
-      "writeTime" : 413676,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5505,
-  "index" : 495,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:00.616GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 133,
-    "resultSize" : 930,
-    "jvmGcTime" : 11,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9602,
-      "writeTime" : 384212,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5672,
-  "index" : 662,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:01.016GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 1,
-    "executorRunTime" : 131,
-    "resultSize" : 930,
-    "jvmGcTime" : 4,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9602,
-      "writeTime" : 387955,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5865,
-  "index" : 855,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:01.514GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 131,
-    "resultSize" : 930,
-    "jvmGcTime" : 10,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9599,
-      "writeTime" : 1710924,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5415,
-  "index" : 405,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:00.389GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 130,
-    "resultSize" : 930,
-    "jvmGcTime" : 14,
-    "resultSerializationTime" : 1,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9597,
-      "writeTime" : 377101,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5462,
-  "index" : 452,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:00.518GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 128,
-    "resultSize" : 930,
-    "jvmGcTime" : 5,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9601,
-      "writeTime" : 306075,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5411,
-  "index" : 401,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:00.385GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 128,
-    "resultSize" : 930,
-    "jvmGcTime" : 14,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9602,
-      "writeTime" : 74684537,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5416,
-  "index" : 406,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:00.392GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 11,
-    "executorRunTime" : 123,
-    "resultSize" : 930,
-    "jvmGcTime" : 14,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9600,
-      "writeTime" : 365240,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5924,
-  "index" : 914,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:01.648GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 4,
-    "executorRunTime" : 121,
-    "resultSize" : 930,
-    "jvmGcTime" : 5,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9601,
-      "writeTime" : 335682,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5179,
-  "index" : 169,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.866GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 114,
-    "resultSize" : 930,
-    "jvmGcTime" : 5,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9601,
-      "writeTime" : 276876,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5243,
-  "index" : 233,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:00.018GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 113,
-    "resultSize" : 930,
-    "jvmGcTime" : 5,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9601,
-      "writeTime" : 12003053,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5054,
-  "index" : 44,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.616GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 110,
-    "resultSize" : 930,
-    "jvmGcTime" : 22,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9602,
-      "writeTime" : 299315,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5465,
-  "index" : 455,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:00.521GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 1,
-    "executorRunTime" : 108,
-    "resultSize" : 930,
-    "jvmGcTime" : 5,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9598,
-      "writeTime" : 318366,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5614,
-  "index" : 604,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:00.893GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 19,
-    "executorRunTime" : 108,
-    "resultSize" : 930,
-    "jvmGcTime" : 7,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9600,
-      "writeTime" : 309135,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5862,
-  "index" : 852,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:01.509GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 96,
-    "resultSize" : 930,
-    "jvmGcTime" : 5,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9598,
-      "writeTime" : 1052228,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5566,
-  "index" : 556,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:00.762GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 95,
-    "resultSize" : 930,
-    "jvmGcTime" : 6,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9600,
-      "writeTime" : 327089,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5567,
-  "index" : 557,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:00.768GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 94,
-    "resultSize" : 930,
-    "jvmGcTime" : 6,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9601,
-      "writeTime" : 374043,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5191,
-  "index" : 181,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.885GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 90,
-    "resultSize" : 930,
-    "jvmGcTime" : 5,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9598,
-      "writeTime" : 344199,
-      "recordsWritten" : 100
-    }
-  }
-} ]
\ No newline at end of file
diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList?sortBy=runtime/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList?sortBy=runtime/json_expectation
deleted file mode 100644
index 329065b835..0000000000
--- a/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList?sortBy=runtime/json_expectation
+++ /dev/null
@@ -1,481 +0,0 @@
-[ {
-  "taskId" : 5610,
-  "index" : 600,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:00.884GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 5,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9601,
-      "writeTime" : 285253,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5511,
-  "index" : 501,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:00.634GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 1,
-    "executorRunTime" : 5,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9599,
-      "writeTime" : 277358,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5027,
-  "index" : 17,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.586GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 1,
-    "executorRunTime" : 5,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9601,
-      "writeTime" : 289503,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5828,
-  "index" : 818,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:01.438GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 3,
-    "executorRunTime" : 5,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9601,
-      "writeTime" : 291997,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5173,
-  "index" : 163,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.861GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 5,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9599,
-      "writeTime" : 267617,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5185,
-  "index" : 175,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.880GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 5,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9600,
-      "writeTime" : 285928,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5553,
-  "index" : 543,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:00.719GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 1,
-    "executorRunTime" : 5,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9601,
-      "writeTime" : 298472,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5077,
-  "index" : 67,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.670GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 1,
-    "executorRunTime" : 5,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9614,
-      "writeTime" : 259332,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5831,
-  "index" : 821,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:01.442GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 1,
-    "executorRunTime" : 5,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9597,
-      "writeTime" : 281603,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5194,
-  "index" : 184,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.903GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 1,
-    "executorRunTime" : 5,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9600,
-      "writeTime" : 286315,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5481,
-  "index" : 471,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:00.561GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 1,
-    "executorRunTime" : 5,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9613,
-      "writeTime" : 328893,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5035,
-  "index" : 25,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.600GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 1,
-    "executorRunTime" : 5,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9602,
-      "writeTime" : 324374,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5134,
-  "index" : 124,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.782GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 5,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9599,
-      "writeTime" : 279741,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5044,
-  "index" : 34,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.607GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 5,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9601,
-      "writeTime" : 279851,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5026,
-  "index" : 16,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.586GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 5,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9598,
-      "writeTime" : 247775,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5331,
-  "index" : 321,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:00.208GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 1,
-    "executorRunTime" : 5,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9601,
-      "writeTime" : 313699,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5343,
-  "index" : 333,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:00.241GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 0,
-    "executorRunTime" : 5,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9601,
-      "writeTime" : 260259,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5606,
-  "index" : 596,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:20:00.878GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 1,
-    "executorRunTime" : 5,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9599,
-      "writeTime" : 310521,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5041,
-  "index" : 31,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.602GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 4,
-    "executorRunTime" : 5,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9603,
-      "writeTime" : 255099,
-      "recordsWritten" : 100
-    }
-  }
-}, {
-  "taskId" : 5023,
-  "index" : 13,
-  "attempt" : 0,
-  "launchTime" : "2015-03-26T19:19:59.579GMT",
-  "executorId" : "<driver>",
-  "host" : "localhost",
-  "taskLocality" : "PROCESS_LOCAL",
-  "speculative" : false,
-  "accumulatorUpdates" : [ ],
-  "taskMetrics" : {
-    "executorDeserializeTime" : 6,
-    "executorRunTime" : 5,
-    "resultSize" : 930,
-    "jvmGcTime" : 0,
-    "resultSerializationTime" : 0,
-    "memoryBytesSpilled" : 0,
-    "diskBytesSpilled" : 0,
-    "shuffleWriteMetrics" : {
-      "bytesWritten" : 9602,
-      "writeTime" : 282108,
-      "recordsWritten" : 100
-    }
-  }
-} ]
\ No newline at end of file
diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskSummary/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskSummary/json_expectation
deleted file mode 100644
index 46f32c19ab..0000000000
--- a/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskSummary/json_expectation
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "quantiles" : [ 0.05, 0.25, 0.5, 0.75, 0.95 ],
-  "executorDeserializeTime" : [ 0.0, 0.0, 0.0, 1.0, 3.0 ],
-  "executorRunTime" : [ 6.0, 6.0, 7.0, 10.0, 48.0 ],
-  "resultSize" : [ 930.0, 930.0, 930.0, 930.0, 930.0 ],
-  "jvmGcTime" : [ 0.0, 0.0, 0.0, 0.0, 7.0 ],
-  "resultSerializationTime" : [ 0.0, 0.0, 0.0, 0.0, 0.0 ],
-  "memoryBytesSpilled" : [ 0.0, 0.0, 0.0, 0.0, 0.0 ],
-  "diskBytesSpilled" : [ 0.0, 0.0, 0.0, 0.0, 0.0 ],
-  "shuffleWriteMetrics" : {
-    "writeBytes" : [ 9598.0, 9599.0, 9600.0, 9601.0, 9603.0 ],
-    "writeRecords" : [ 100.0, 100.0, 100.0, 100.0, 100.0 ],
-    "writeTime" : [ 278805.0, 308809.0, 327953.0, 367487.0, 944783.0 ]
-  }
-}
\ No newline at end of file
diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskSummary?quantiles=0.01,0.5,0.99/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskSummary?quantiles=0.01,0.5,0.99/json_expectation
deleted file mode 100644
index 65b46388ce..0000000000
--- a/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskSummary?quantiles=0.01,0.5,0.99/json_expectation
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "quantiles" : [ 0.01, 0.5, 0.99 ],
-  "executorDeserializeTime" : [ 0.0, 0.0, 25.0 ],
-  "executorRunTime" : [ 5.0, 7.0, 123.0 ],
-  "resultSize" : [ 930.0, 930.0, 930.0 ],
-  "jvmGcTime" : [ 0.0, 0.0, 14.0 ],
-  "resultSerializationTime" : [ 0.0, 0.0, 1.0 ],
-  "memoryBytesSpilled" : [ 0.0, 0.0, 0.0 ],
-  "diskBytesSpilled" : [ 0.0, 0.0, 0.0 ],
-  "shuffleWriteMetrics" : {
-    "writeBytes" : [ 9597.0, 9600.0, 9614.0 ],
-    "writeRecords" : [ 100.0, 100.0, 100.0 ],
-    "writeTime" : [ 260991.0, 327953.0, 8980526.0 ]
-  }
-}
\ No newline at end of file
diff --git a/core/src/test/resources/HistoryServerExpectations/applications?maxDate=2015-02-03T10:42:40.000CST/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications?maxDate=2015-02-03T10:42:40.000CST/json_expectation
deleted file mode 100644
index 483632a395..0000000000
--- a/core/src/test/resources/HistoryServerExpectations/applications?maxDate=2015-02-03T10:42:40.000CST/json_expectation
+++ /dev/null
@@ -1,10 +0,0 @@
-[ {
-  "id" : "local-1422981759269",
-  "name" : "Spark shell",
-  "attempts" : [ {
-    "startTime" : "2015-02-03T16:42:38.277GMT",
-    "endTime" : "2015-02-03T16:42:46.912GMT",
-    "sparkUser" : "irashid",
-    "completed" : true
-  } ]
-} ]
\ No newline at end of file
diff --git a/core/src/test/resources/HistoryServerExpectations/applications?maxDate=2015-02-10/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications?maxDate=2015-02-10/json_expectation
deleted file mode 100644
index 4b85690fd9..0000000000
--- a/core/src/test/resources/HistoryServerExpectations/applications?maxDate=2015-02-10/json_expectation
+++ /dev/null
@@ -1,19 +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
-  } ]
-}, {
-  "id" : "local-1422981759269",
-  "name" : "Spark shell",
-  "attempts" : [ {
-    "startTime" : "2015-02-03T16:42:38.277GMT",
-    "endTime" : "2015-02-03T16:42:46.912GMT",
-    "sparkUser" : "irashid",
-    "completed" : true
-  } ]
-} ]
\ No newline at end of file
diff --git a/core/src/test/resources/HistoryServerExpectations/applications?minDate=2015-02-10/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications?minDate=2015-02-10/json_expectation
deleted file mode 100644
index e67f25252e..0000000000
--- a/core/src/test/resources/HistoryServerExpectations/applications?minDate=2015-02-10/json_expectation
+++ /dev/null
@@ -1,35 +0,0 @@
-[ {
-  "id" : "local-1427397477963",
-  "name" : "Spark shell",
-  "attempts" : [ {
-    "startTime" : "2015-03-26T19:17:57.184GMT",
-    "endTime" : "2015-03-26T19:20:02.949GMT",
-    "sparkUser" : "irashid",
-    "completed" : true
-  } ]
-}, {
-  "id" : "local-1426533911241",
-  "name" : "Spark shell",
-  "attempts" : [ {
-    "attemptId" : "2",
-    "startTime" : "2015-03-17T23:11:50.242GMT",
-    "endTime" : "2015-03-17T23:12:25.177GMT",
-    "sparkUser" : "irashid",
-    "completed" : true
-  }, {
-    "attemptId" : "1",
-    "startTime" : "2015-03-16T19:25:10.242GMT",
-    "endTime" : "2015-03-16T19:25:45.177GMT",
-    "sparkUser" : "irashid",
-    "completed" : true
-  } ]
-}, {
-  "id" : "local-1425081759269",
-  "name" : "Spark shell",
-  "attempts" : [ {
-    "startTime" : "2015-02-28T00:02:38.277GMT",
-    "endTime" : "2015-02-28T00:02:46.912GMT",
-    "sparkUser" : "irashid",
-    "completed" : true
-  } ]
-} ]
\ No newline at end of file
diff --git a/core/src/test/resources/HistoryServerExpectations/applications?status=completed/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications?status=completed/json_expectation
deleted file mode 100644
index 6101177e4b..0000000000
--- a/core/src/test/resources/HistoryServerExpectations/applications?status=completed/json_expectation
+++ /dev/null
@@ -1,53 +0,0 @@
-[ {
-  "id" : "local-1427397477963",
-  "name" : "Spark shell",
-  "attempts" : [ {
-    "startTime" : "2015-03-26T19:17:57.184GMT",
-    "endTime" : "2015-03-26T19:20:02.949GMT",
-    "sparkUser" : "irashid",
-    "completed" : true
-  } ]
-}, {
-  "id" : "local-1426533911241",
-  "name" : "Spark shell",
-  "attempts" : [ {
-    "attemptId" : "2",
-    "startTime" : "2015-03-17T23:11:50.242GMT",
-    "endTime" : "2015-03-17T23:12:25.177GMT",
-    "sparkUser" : "irashid",
-    "completed" : true
-  }, {
-    "attemptId" : "1",
-    "startTime" : "2015-03-16T19:25:10.242GMT",
-    "endTime" : "2015-03-16T19:25:45.177GMT",
-    "sparkUser" : "irashid",
-    "completed" : true
-  } ]
-}, {
-  "id" : "local-1425081759269",
-  "name" : "Spark shell",
-  "attempts" : [ {
-    "startTime" : "2015-02-28T00:02:38.277GMT",
-    "endTime" : "2015-02-28T00:02:46.912GMT",
-    "sparkUser" : "irashid",
-    "completed" : true
-  } ]
-}, {
-  "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
-  } ]
-}, {
-  "id" : "local-1422981759269",
-  "name" : "Spark shell",
-  "attempts" : [ {
-    "startTime" : "2015-02-03T16:42:38.277GMT",
-    "endTime" : "2015-02-03T16:42:46.912GMT",
-    "sparkUser" : "irashid",
-    "completed" : true
-  } ]
-} ]
\ No newline at end of file
diff --git a/core/src/test/resources/HistoryServerExpectations/applications?status=running/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications?status=running/json_expectation
deleted file mode 100644
index 8878e547a7..0000000000
--- a/core/src/test/resources/HistoryServerExpectations/applications?status=running/json_expectation
+++ /dev/null
@@ -1 +0,0 @@
-[ ]
\ No newline at end of file