diff --git a/README.md b/README.md
index 849cd483dd258f64c5082b42c41c606c246cf4bc..55dbcc344448e3e1db5ba02f29ddb390e6f16311 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,16 @@
 # nshmp-haz
 
-U.S. Geological Survey ([USGS](https://www.usgs.gov)) National Seismic Hazard Model Project
-([NSHMP](https://earthquake.usgs.gov/hazards/)) codes for performing probabilistic seismic
-hazard (PSHA) and related analyses. These codes are intended for use with seismic hazard models
-developed by the NSHMP for the U.S. and its territories. This project includes a variety of
-command line applications and web service classes and relies on the
-[*nshmp-lib*](https://code.usgs.gov/ghsc/nshmp/nshmp-lib) hazard library, among other
-dependencies.
-
-Please see the [docs](docs/README.md) for more information.
+U.S. Geological Survey ([USGS][1]) National Seismic Hazard Model Project ([NSHMP][2]) codes for
+performing probabilistic seismic hazard (PSHA) and related analyses. These codes are intended for
+use with seismic hazard models developed by the NSHMP for the U.S. and its territories. This
+project includes a variety of command line applications and web service classes and relies on the
+[*nshmp-lib*][3] hazard library, among other dependencies.
+
+Please see the [documentation](docs/README.md) for more information.
+
+DOI: <https://doi.org/10.5066/P9STF5GK> (version [2.0.0][4])
+
+[1]: https://www.usgs.gov
+[2]: https://www.usgs.gov/programs/earthquake-hazards/hazards
+[3]: https://code.usgs.gov/ghsc/nshmp/nshmp-lib
+[4]: https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tags/2.0.0
diff --git a/build.gradle b/build.gradle
index 0c95cf8745a24e525db09980943c34e69a8a833a..5a8318fc9b25bf108490fe2674ffbf6d7697fcd9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -108,6 +108,7 @@ test {
   useJUnitPlatform()
 
   filter {
-    excludeTestsMatching "gov.usgs.earthquake.nshmp.model.NshmTestsLarge"
+    excludeTestsMatching "gov.usgs.earthquake.nshmp.model.NshmTestsConus"
+    excludeTestsMatching "gov.usgs.earthquake.nshmp.model.NshmTestsHawaii"
   }
 }
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestsLarge.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestsConus.java
similarity index 74%
rename from src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestsLarge.java
rename to src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestsConus.java
index 4427652acbde1ff8bc6bb4beb87c3db14d98f9a5..529d2a795f73cdc70c40ca8fecc112bfbf100e6f 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestsLarge.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestsConus.java
@@ -1,5 +1,9 @@
 package gov.usgs.earthquake.nshmp.model;
 
+import static gov.usgs.earthquake.nshmp.gmm.Imt.PGA;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.SA0P2;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.SA1P0;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.SA5P0;
 import static gov.usgs.earthquake.nshmp.site.NshmpSite.BOSTON_MA;
 import static gov.usgs.earthquake.nshmp.site.NshmpSite.CHICAGO_IL;
 import static gov.usgs.earthquake.nshmp.site.NshmpSite.LOS_ANGELES_CA;
@@ -11,7 +15,6 @@ import static gov.usgs.earthquake.nshmp.site.NshmpSite.SAN_FRANCISCO_CA;
 import static gov.usgs.earthquake.nshmp.site.NshmpSite.SEATTLE_WA;
 import static java.lang.Math.abs;
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.BufferedReader;
@@ -20,16 +23,20 @@ import java.lang.reflect.Type;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.EnumSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import com.google.common.reflect.TypeToken;
 import com.google.gson.Gson;
@@ -38,10 +45,13 @@ import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
 import gov.usgs.earthquake.nshmp.NamedLocation;
+import gov.usgs.earthquake.nshmp.calc.CalcConfig;
 import gov.usgs.earthquake.nshmp.calc.Hazard;
 import gov.usgs.earthquake.nshmp.calc.HazardCalcs;
 import gov.usgs.earthquake.nshmp.calc.Site;
 import gov.usgs.earthquake.nshmp.data.XySequence;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.gmm.Imt;
 
 /**
  * Class for end-to-end tests of hazard calculations. These tests require
@@ -52,11 +62,11 @@ import gov.usgs.earthquake.nshmp.data.XySequence;
  *
  * @author U.S. Geological Survey
  */
-class NshmTestsLarge {
+class NshmTestsConus {
 
   private static final double TOLERANCE = 1e-12;
 
-  private static final List<NamedLocation> CONUS_SITES = List.of(
+  private static final List<NamedLocation> SITES = List.of(
       LOS_ANGELES_CA,
       SAN_FRANCISCO_CA,
       SEATTLE_WA,
@@ -67,61 +77,53 @@ class NshmTestsLarge {
       NEW_YORK_NY,
       CHICAGO_IL);
 
-  /*
-   * These tests use project relative file paths to read/write directly to/from
-   * the source tree.
-   */
+  private static final Set<Imt> IMTS = EnumSet.of(PGA, SA0P2, SA1P0, SA5P0);
+
+  private static final String MODEL_NAME = "nshm-conus";
+  private static final int MODEL_YEAR = 2018;
+  private static final Path MODEL_PATH = Paths.get("../" + MODEL_NAME);
+  private static final Path DATA_PATH = Paths.get("src/test/resources/e2e");
+
   private static final Gson GSON = new GsonBuilder()
       .setPrettyPrinting()
       .create();
 
-  private static ExecutorService EXEC;
+  private static ExecutorService exec;
+  private static HazardModel model;
+  static Map<Location, Map<String, XySequence>> expecteds;
 
   @BeforeAll
   static void setUpBeforeClass() {
+    model = ModelLoader.load(MODEL_PATH);
     int cores = Runtime.getRuntime().availableProcessors();
-    EXEC = Executors.newFixedThreadPool(cores);
+    exec = Executors.newFixedThreadPool(cores);
   }
 
   @AfterAll
   static void tearDownAfterClass() {
-    EXEC.shutdown();
+    exec.shutdown();
   }
 
-  private static final Path MODEL_PATH = Paths.get("../");
-  private static final Path DATA_PATH = Paths.get("src/test/resources/e2e");
-
-  @Test
-  public void testConus2018() {
-    testModel("nshm-conus", 2018, CONUS_SITES);
+  @ParameterizedTest
+  @MethodSource("siteStream")
+  final void testLocation(NamedLocation site) {
+    compareCurves(site);
   }
 
-  private static void testModel(
-      String modelName,
-      int year,
-      List<NamedLocation> locations) {
-
-    Path modelPath = MODEL_PATH.resolve(modelName);
-    HazardModel model = ModelLoader.load(modelPath);
-    for (NamedLocation location : locations) {
-      compareCurves(modelName, year, model, location);
-    }
+  private static Stream<NamedLocation> siteStream() {
+    return SITES.stream();
   }
 
-  private static void compareCurves(
-      String modelName,
-      int year,
-      HazardModel model,
-      NamedLocation location) {
+  private static void compareCurves(NamedLocation location) {
 
     // String actual = generateActual(model, location);
-    Map<String, XySequence> actual = generateActual(model, location);
+    Map<String, XySequence> actual = generateActual(location);
     // String expected = readExpected(modelName, year, location);
-    Map<String, XySequence> expected = readExpected(modelName, year, location);
+    Map<String, XySequence> expected = readExpected(location);
     // assertEquals(expected, actual);
 
-    assertEquals(expected.keySet(), actual.keySet());
-    for (String key : expected.keySet()) {
+    // assertEquals(expected.keySet(), actual.keySet());
+    for (String key : actual.keySet()) {
       assertCurveEquals(expected.get(key), actual.get(key), TOLERANCE);
     }
   }
@@ -153,17 +155,19 @@ class NshmTestsLarge {
         Double.valueOf(expected).equals(Double.valueOf(actual));
   }
 
-  private static Map<String, XySequence> generateActual(
-      HazardModel model,
-      NamedLocation location) {
+  private static Map<String, XySequence> generateActual(NamedLocation location) {
 
     Site site = Site.builder().location(location.location()).build();
 
+    CalcConfig config = CalcConfig.copyOf(model.config())
+        .imts(IMTS)
+        .build();
+
     Hazard hazard = HazardCalcs.hazard(
         model,
-        model.config(),
+        config,
         site,
-        EXEC);
+        exec);
 
     Map<String, XySequence> xyMap = hazard.curves().entrySet().stream()
         .collect(Collectors.toMap(
@@ -171,7 +175,6 @@ class NshmTestsLarge {
             Entry::getValue));
 
     return xyMap;
-    // return GSON.toJson(hazard.curves());
   }
 
   private static String resultFilename(
@@ -182,12 +185,9 @@ class NshmTestsLarge {
     return modelName + "-" + year + "-" + loc.name() + ".json";
   }
 
-  private static Map<String, XySequence> readExpected(
-      String modelName,
-      int year,
-      NamedLocation loc) {
+  private static Map<String, XySequence> readExpected(NamedLocation loc) {
 
-    String filename = resultFilename(modelName, year, loc);
+    String filename = resultFilename(MODEL_NAME, MODEL_YEAR, loc);
     Path resultPath = DATA_PATH.resolve(filename);
 
     JsonObject obj = null;
@@ -210,6 +210,7 @@ class NshmTestsLarge {
     double[] xs;
     double[] ys;
 
+    @SuppressWarnings("unused")
     Curve(double[] xs, double[] ys) {
       this.xs = xs;
       this.ys = ys;
@@ -221,11 +222,9 @@ class NshmTestsLarge {
       int year,
       List<NamedLocation> locations) throws IOException {
 
-    Path modelPath = MODEL_PATH.resolve(modelName);
-    HazardModel model = ModelLoader.load(modelPath);
     for (NamedLocation location : locations) {
       // String json = generateActual(model, location);
-      Map<String, XySequence> xyMap = generateActual(model, location);
+      Map<String, XySequence> xyMap = generateActual(location);
       String json = GSON.toJson(xyMap);
       writeExpected(modelName, year, location, json);
     }
@@ -247,7 +246,7 @@ class NshmTestsLarge {
     /* Initialize and shut down executor to generate results. */
     setUpBeforeClass();
 
-    writeExpecteds("nshm-conus", 2018, CONUS_SITES);
+    writeExpecteds(MODEL_NAME, MODEL_YEAR, SITES);
 
     tearDownAfterClass();
   }
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestsHawaii.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestsHawaii.java
new file mode 100644
index 0000000000000000000000000000000000000000..6d184fea8d2e93f86538af6d9cfa22d8e9207d61
--- /dev/null
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestsHawaii.java
@@ -0,0 +1,243 @@
+package gov.usgs.earthquake.nshmp.model;
+
+import static gov.usgs.earthquake.nshmp.gmm.Imt.PGA;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.SA0P2;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.SA1P0;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.SA5P0;
+import static gov.usgs.earthquake.nshmp.site.NshmpSite.HILO_HI;
+import static gov.usgs.earthquake.nshmp.site.NshmpSite.HONOLULU_HI;
+import static gov.usgs.earthquake.nshmp.site.NshmpSite.KAILUA_KONA_HI;
+import static java.lang.Math.abs;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import com.google.common.reflect.TypeToken;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+
+import gov.usgs.earthquake.nshmp.NamedLocation;
+import gov.usgs.earthquake.nshmp.calc.CalcConfig;
+import gov.usgs.earthquake.nshmp.calc.Hazard;
+import gov.usgs.earthquake.nshmp.calc.HazardCalcs;
+import gov.usgs.earthquake.nshmp.calc.Site;
+import gov.usgs.earthquake.nshmp.data.XySequence;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.gmm.Imt;
+
+/**
+ * Class for end-to-end tests of hazard calculations. These tests require
+ * significant system resources to load source models, and source models are
+ * required to be in adjacent repositories. These tests should be run
+ * frequently, but not necessarily as part of continuous integration. Needs
+ * parameterization and additional regions.
+ *
+ * @author U.S. Geological Survey
+ */
+class NshmTestsHawaii {
+
+  private static final double TOLERANCE = 1e-12;
+
+  private static final List<NamedLocation> SITES = List.of(
+      HILO_HI,
+      HONOLULU_HI,
+      KAILUA_KONA_HI);
+
+  private static final Set<Imt> IMTS = EnumSet.of(PGA, SA0P2, SA1P0, SA5P0);
+
+  private static final String MODEL_NAME = "nshm-hawaii";
+  private static final int MODEL_YEAR = 2021;
+  private static final Path MODEL_PATH = Paths.get("../" + MODEL_NAME);
+  private static final Path DATA_PATH = Paths.get("src/test/resources/e2e");
+
+  private static final Gson GSON = new GsonBuilder()
+      .setPrettyPrinting()
+      .create();
+
+  private static ExecutorService exec;
+  private static HazardModel model;
+  static Map<Location, Map<String, XySequence>> expecteds;
+
+  @BeforeAll
+  static void setUpBeforeClass() {
+    model = ModelLoader.load(MODEL_PATH);
+    int cores = Runtime.getRuntime().availableProcessors();
+    exec = Executors.newFixedThreadPool(cores);
+  }
+
+  @AfterAll
+  static void tearDownAfterClass() {
+    exec.shutdown();
+  }
+
+  @ParameterizedTest
+  @MethodSource("siteStream")
+  final void testLocation(NamedLocation site) {
+    compareCurves(site);
+  }
+
+  private static Stream<NamedLocation> siteStream() {
+    return SITES.stream();
+  }
+
+  private static void compareCurves(NamedLocation location) {
+
+    // String actual = generateActual(model, location);
+    Map<String, XySequence> actual = generateActual(location);
+    // String expected = readExpected(modelName, year, location);
+    Map<String, XySequence> expected = readExpected(location);
+    // assertEquals(expected, actual);
+
+    assertEquals(expected.keySet(), actual.keySet());
+    for (String key : actual.keySet()) {
+      assertCurveEquals(expected.get(key), actual.get(key), TOLERANCE);
+    }
+  }
+
+  private static void assertCurveEquals(XySequence expected, XySequence actual, double tol) {
+
+    // IMLs close but not exact due to exp() transform
+    assertArrayEquals(
+        expected.xValues().toArray(),
+        actual.xValues().toArray());
+
+    double[] expectedYs = expected.yValues().toArray();
+    double[] actualYs = actual.yValues().toArray();
+
+    // absolute y-value difference relative to tolerance
+    assertArrayEquals(expectedYs, actualYs, tol);
+
+    // relative y-value difference relative to tolerance
+    for (int i = 0; i < expectedYs.length; i++) {
+      String message = String.format(
+          "arrays differ at [%s] expected:<[%s]> but was:<[%s]>",
+          i, expectedYs[i], actualYs[i]);
+      assertTrue(compare(expectedYs[i], actualYs[i], tol), message);
+    }
+  }
+
+  private static boolean compare(double expected, double actual, double tolerance) {
+    return abs(actual - expected) / expected < tolerance ||
+        Double.valueOf(expected).equals(Double.valueOf(actual));
+  }
+
+  private static Map<String, XySequence> generateActual(NamedLocation location) {
+
+    Site site = Site.builder().location(location.location()).build();
+
+    CalcConfig config = CalcConfig.copyOf(model.config())
+        .imts(IMTS)
+        .build();
+
+    Hazard hazard = HazardCalcs.hazard(
+        model,
+        config,
+        site,
+        exec);
+
+    Map<String, XySequence> xyMap = hazard.curves().entrySet().stream()
+        .collect(Collectors.toMap(
+            e -> e.getKey().toString(),
+            Entry::getValue));
+
+    return xyMap;
+  }
+
+  private static String resultFilename(
+      String modelName,
+      int year,
+      NamedLocation loc) {
+
+    return modelName + "-" + year + "-" + loc.name() + ".json";
+  }
+
+  private static Map<String, XySequence> readExpected(NamedLocation loc) {
+
+    String filename = resultFilename(MODEL_NAME, MODEL_YEAR, loc);
+    Path resultPath = DATA_PATH.resolve(filename);
+
+    JsonObject obj = null;
+    try (BufferedReader br = Files.newBufferedReader(resultPath)) {
+      obj = JsonParser.parseReader(br).getAsJsonObject();
+    } catch (IOException ioe) {
+      throw new RuntimeException(ioe);
+    }
+
+    Type curveDataType = new TypeToken<Map<String, Curve>>() {}.getType();
+    Map<String, Curve> curveMap = GSON.fromJson(obj, curveDataType);
+    Map<String, XySequence> xyMap = curveMap.entrySet().stream()
+        .collect(Collectors.toMap(
+            Entry::getKey,
+            e -> XySequence.create(e.getValue().xs, e.getValue().ys)));
+    return xyMap;
+  }
+
+  private static class Curve {
+    double[] xs;
+    double[] ys;
+
+    @SuppressWarnings("unused")
+    Curve(double[] xs, double[] ys) {
+      this.xs = xs;
+      this.ys = ys;
+    }
+  }
+
+  private static void writeExpecteds(
+      String modelName,
+      int year,
+      List<NamedLocation> locations) throws IOException {
+
+    for (NamedLocation location : locations) {
+      // String json = generateActual(model, location);
+      Map<String, XySequence> xyMap = generateActual(location);
+      String json = GSON.toJson(xyMap);
+      writeExpected(modelName, year, location, json);
+    }
+  }
+
+  private static void writeExpected(
+      String modelName,
+      int year,
+      NamedLocation loc,
+      String json) throws IOException {
+
+    String filename = resultFilename(modelName, year, loc);
+    Path resultPath = DATA_PATH.resolve(filename);
+    Files.write(resultPath, json.getBytes());
+  }
+
+  public static void main(String[] args) throws IOException {
+
+    /* Initialize and shut down executor to generate results. */
+    setUpBeforeClass();
+
+    writeExpecteds(MODEL_NAME, MODEL_YEAR, SITES);
+
+    tearDownAfterClass();
+  }
+
+}
diff --git a/src/test/resources/data/e2e-ceus-2008-BOSTON_MA.json b/src/test/resources/data/e2e-ceus-2008-BOSTON_MA.json
deleted file mode 100644
index 32877405de6c23fb882fd1b3869ab98a7581791c..0000000000000000000000000000000000000000
--- a/src/test/resources/data/e2e-ceus-2008-BOSTON_MA.json
+++ /dev/null
@@ -1,140 +0,0 @@
-{
-  "Peak Ground Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.032845335283417904,
-      0.019271870733616935,
-      0.01164594401448505,
-      0.007565258957269701,
-      0.004824363521336283,
-      0.0029901736431586024,
-      0.0017994337102484996,
-      0.0010617558225579976,
-      6.161683041832731E-4,
-      3.510785201967624E-4,
-      1.9609551050046544E-4,
-      1.0714430142504995E-4,
-      5.649388901184487E-5,
-      2.7939724421837443E-5,
-      1.2535220022689412E-5,
-      4.669384063900139E-6,
-      1.1225515473611432E-6,
-      0.0,
-      0.0,
-      0.0
-    ]
-  },
-  "0.20 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.06260840388560951,
-      0.04039164027849973,
-      0.026072241443623235,
-      0.0177290509996657,
-      0.01179046978941841,
-      0.007593163155470366,
-      0.004707425765194736,
-      0.0028202294901446606,
-      0.0016351763131113642,
-      9.18252940114349E-4,
-      5.002778489558849E-4,
-      2.650166335969918E-4,
-      1.364356937005198E-4,
-      6.782928805634952E-5,
-      3.232141912163459E-5,
-      1.4289964491783254E-5,
-      5.596492887123873E-6,
-      1.7740645979680137E-6,
-      3.039610236739372E-7,
-      0.0
-    ]
-  },
-  "1.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.02551626580380438,
-      0.014596331853839144,
-      0.008407544551918777,
-      0.005125949609925932,
-      0.0029973267374684177,
-      0.0016600979338032874,
-      8.687336602609939E-4,
-      4.353740339918759E-4,
-      2.1098972430244587E-4,
-      9.961634308459658E-5,
-      4.616442710543097E-5,
-      2.0993233581008445E-5,
-      9.19213804366633E-6,
-      3.736429543605766E-6,
-      1.3770958539086508E-6,
-      4.4870529854656515E-7,
-      1.2736829802440247E-7,
-      3.044096424919048E-8,
-      5.354202287386445E-9,
-      5.156262037123767E-10
-    ]
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/data/e2e-ceus-2008-CHICAGO_IL.json b/src/test/resources/data/e2e-ceus-2008-CHICAGO_IL.json
deleted file mode 100644
index 9597621134533829bba8ccd48ee99fc2085d97e2..0000000000000000000000000000000000000000
--- a/src/test/resources/data/e2e-ceus-2008-CHICAGO_IL.json
+++ /dev/null
@@ -1,140 +0,0 @@
-{
-  "Peak Ground Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.021011657582493157,
-      0.011745317993887715,
-      0.0070529478576701506,
-      0.004648209009376419,
-      0.0029552922166106756,
-      0.0017180112409970055,
-      9.356025370003741E-4,
-      5.148155720111109E-4,
-      2.913318494413207E-4,
-      1.666371581205527E-4,
-      9.471417385645067E-5,
-      5.263864336576044E-5,
-      2.790568462098098E-5,
-      1.3659160208026654E-5,
-      5.979710061064167E-6,
-      2.1562181884775107E-6,
-      5.015525801689974E-7,
-      0.0,
-      0.0,
-      0.0
-    ]
-  },
-  "0.20 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.04334990621845024,
-      0.026006612503736082,
-      0.015989767759184474,
-      0.010648651631585692,
-      0.007074721183512818,
-      0.004586668466469397,
-      0.0027860043202569155,
-      0.0015554689978676934,
-      8.238502765113053E-4,
-      4.314465822738997E-4,
-      2.2698404554952087E-4,
-      1.1934223254755341E-4,
-      6.179220248788244E-5,
-      3.0882005234674795E-5,
-      1.4579379295630435E-5,
-      6.257048819306014E-6,
-      2.336262367557198E-6,
-      6.963576434676948E-7,
-      1.1136637874219313E-7,
-      0.0
-    ]
-  },
-  "1.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.020039892087649558,
-      0.011463344487992279,
-      0.006779933192638631,
-      0.004333471504853553,
-      0.0027177777034868597,
-      0.0016101458155361556,
-      8.436671054176093E-4,
-      3.754397680377871E-4,
-      1.4503144304940646E-4,
-      5.185640889550897E-5,
-      1.8837528080385413E-5,
-      7.277452810428256E-6,
-      2.8909697622434603E-6,
-      1.109677238535673E-6,
-      3.7951176549768314E-7,
-      1.1096501934560927E-7,
-      2.6875099397377754E-8,
-      5.068537119556577E-9,
-      5.526489957914575E-10,
-      1.2873887159352931E-11
-    ]
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/data/e2e-ceus-2008-NEW_MADRID_MO.json b/src/test/resources/data/e2e-ceus-2008-NEW_MADRID_MO.json
deleted file mode 100644
index f3760055e56c980a449f705908fb6ed8f233807e..0000000000000000000000000000000000000000
--- a/src/test/resources/data/e2e-ceus-2008-NEW_MADRID_MO.json
+++ /dev/null
@@ -1,140 +0,0 @@
-{
-  "Peak Ground Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.06597232037051814,
-      0.048983459277503597,
-      0.03589522895653209,
-      0.026875605651377935,
-      0.019528338236197776,
-      0.013774744220384917,
-      0.009546819372096414,
-      0.006663254304911904,
-      0.00478959108032048,
-      0.0036097968236590097,
-      0.00287900982175738,
-      0.00241806326852379,
-      0.002091808281280755,
-      0.001783400420394899,
-      0.0013852568757778986,
-      8.426346669781989E-4,
-      2.922368593510044E-4,
-      0.0,
-      0.0,
-      0.0
-    ]
-  },
-  "0.20 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.09204526485646074,
-      0.07261661857278319,
-      0.05708160013226393,
-      0.04553888512768202,
-      0.03518705310839663,
-      0.026077295457710016,
-      0.01849590985468671,
-      0.012710881367898873,
-      0.00861503212952866,
-      0.005893154920029084,
-      0.00418383934030149,
-      0.0031596392405528256,
-      0.0025582093408824808,
-      0.0021868970292590996,
-      0.0019022580974658195,
-      0.0015759091964408529,
-      0.0011214926775410694,
-      5.881519491480588E-4,
-      1.4697509806207025E-4,
-      0.0
-    ]
-  },
-  "1.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.04325151171799195,
-      0.027793087425498537,
-      0.018045269854457736,
-      0.012463546014546288,
-      0.008610998257344734,
-      0.006013681139974198,
-      0.004322570144286981,
-      0.0032728361452091645,
-      0.002640268658946445,
-      0.002258544881418056,
-      0.002001157551912162,
-      0.0017662462867376874,
-      0.0014761057395787074,
-      0.001098917660981453,
-      6.961360236969482E-4,
-      3.7045018499348915E-4,
-      1.676122084138383E-4,
-      6.440671208094122E-5,
-      2.040599620956906E-5,
-      4.702615777830019E-6
-    ]
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/data/e2e-ceus-2008-NEW_ORLEANS_LA.json b/src/test/resources/data/e2e-ceus-2008-NEW_ORLEANS_LA.json
deleted file mode 100644
index a9a455bca4aa184383df72c2929b6015d7ba4e24..0000000000000000000000000000000000000000
--- a/src/test/resources/data/e2e-ceus-2008-NEW_ORLEANS_LA.json
+++ /dev/null
@@ -1,140 +0,0 @@
-{
-  "Peak Ground Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.013290408660406962,
-      0.007771776084334758,
-      0.0048001952828704685,
-      0.003137834406304481,
-      0.0019025110204362343,
-      0.0010428412296862631,
-      5.468016321343783E-4,
-      2.911002386108378E-4,
-      1.5806142541984657E-4,
-      8.64126721128556E-5,
-      4.717980911212892E-5,
-      2.554703620286199E-5,
-      1.346652877873392E-5,
-      6.689800835806199E-6,
-      3.0160315520012757E-6,
-      1.1273295874979415E-6,
-      2.707596851989492E-7,
-      0.0,
-      0.0,
-      0.0
-    ]
-  },
-  "0.20 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.025912841301749527,
-      0.015592048884739538,
-      0.009915517499564822,
-      0.006835414960145437,
-      0.004636177389470968,
-      0.0029671819679087507,
-      0.0017283170038648603,
-      9.337610460814237E-4,
-      4.8812409040529186E-4,
-      2.523525329270295E-4,
-      1.2941743958539445E-4,
-      6.567547774157462E-5,
-      3.291068920083912E-5,
-      1.6193208413679634E-5,
-      7.713275208660345E-6,
-      3.415817982258719E-6,
-      1.3411356999018175E-6,
-      4.2508253908309143E-7,
-      7.268953668899739E-8,
-      0.0
-    ]
-  },
-  "1.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.014245999418104748,
-      0.008287482587103255,
-      0.004980548490124501,
-      0.0032280289309054404,
-      0.0020381555453178827,
-      0.0011870173570928582,
-      5.96042053266715E-4,
-      2.5481237275704E-4,
-      9.684503576887403E-5,
-      3.5032455823833146E-5,
-      1.3167416403167116E-5,
-      5.255830217295335E-6,
-      2.192476334579033E-6,
-      8.889982274986836E-7,
-      3.2763964524458396E-7,
-      1.0689828760561411E-7,
-      3.040656011255277E-8,
-      7.2693472767427255E-9,
-      1.2590209867560335E-9,
-      1.122744466263514E-10
-    ]
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/data/e2e-ceus-2008-NEW_YORK_NY.json b/src/test/resources/data/e2e-ceus-2008-NEW_YORK_NY.json
deleted file mode 100644
index 0ded17ad165b415599bf3adf8aec86ed19bafeb3..0000000000000000000000000000000000000000
--- a/src/test/resources/data/e2e-ceus-2008-NEW_YORK_NY.json
+++ /dev/null
@@ -1,140 +0,0 @@
-{
-  "Peak Ground Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.026826103334926445,
-      0.015901444669377818,
-      0.009994986336525766,
-      0.00688446753053671,
-      0.004755791816784942,
-      0.0032463765521287256,
-      0.0021739582080474206,
-      0.0014292145722377388,
-      9.176640337062563E-4,
-      5.705637188946782E-4,
-      3.4066799238020195E-4,
-      1.938705184892774E-4,
-      1.0408985365526641E-4,
-      5.1849621708576586E-5,
-      2.3368648206931507E-5,
-      8.742710189275466E-6,
-      2.1088784289901903E-6,
-      0.0,
-      0.0,
-      0.0
-    ]
-  },
-  "0.20 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.05143488470898855,
-      0.03230895543125056,
-      0.020772941176730345,
-      0.014357118649109692,
-      0.009910539972708687,
-      0.006768150780653822,
-      0.004534095632955472,
-      0.0029761394391337147,
-      0.001907168570168238,
-      0.0011868168751772092,
-      7.130319452007805E-4,
-      4.114112204815785E-4,
-      2.2666697864273395E-4,
-      1.1833785298970216E-4,
-      5.833918323476849E-5,
-      2.6428451080274565E-5,
-      1.0547818630477634E-5,
-      3.3953163474165005E-6,
-      5.891728038863058E-7,
-      0.0
-    ]
-  },
-  "1.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.023749676152865943,
-      0.013571481176673532,
-      0.007770900432723018,
-      0.004698479689511626,
-      0.002737916855074722,
-      0.0015374911202469517,
-      8.388375743395918E-4,
-      4.520457227900512E-4,
-      2.4193684235336398E-4,
-      1.282326019018345E-4,
-      6.679394545133586E-5,
-      3.365637745314329E-5,
-      1.5965870949129227E-5,
-      6.880326794588463E-6,
-      2.6440645532397284E-6,
-      8.875971246561373E-7,
-      2.575564566769245E-7,
-      6.260739404573791E-8,
-      1.0990534741556728E-8,
-      9.94776036993341E-10
-    ]
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/data/e2e-ceus-2014-BOSTON_MA.json b/src/test/resources/data/e2e-ceus-2014-BOSTON_MA.json
deleted file mode 100644
index 4aead0b0e1b5f44aa7b4ee7049bc9224b7793b90..0000000000000000000000000000000000000000
--- a/src/test/resources/data/e2e-ceus-2014-BOSTON_MA.json
+++ /dev/null
@@ -1,140 +0,0 @@
-{
-  "Peak Ground Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.05300316039926065,
-      0.03174441027092604,
-      0.019369837749704286,
-      0.012506412234020055,
-      0.007849592340448599,
-      0.00477607681822873,
-      0.0028256112002760982,
-      0.001643776770123139,
-      9.427599508176501E-4,
-      5.314561513159366E-4,
-      2.922019328188888E-4,
-      1.546670868504263E-4,
-      7.708038047726699E-5,
-      3.499495868918258E-5,
-      1.403227703778927E-5,
-      4.585708155237945E-6,
-      9.636462329192944E-7,
-      0.0,
-      0.0,
-      0.0
-    ]
-  },
-  "0.20 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.09994991972075573,
-      0.06454985899447424,
-      0.04168558603495126,
-      0.028222272285898617,
-      0.018509781937603248,
-      0.011619120154541664,
-      0.0069567727941211,
-      0.004008690513410847,
-      0.002234122228314083,
-      0.0012085327156936803,
-      6.365412512383969E-4,
-      3.2732629011921074E-4,
-      1.6298751965356106E-4,
-      7.695743976268631E-5,
-      3.380004647247486E-5,
-      1.3295784383980911E-5,
-      4.489704322707609E-6,
-      1.1932702113127912E-6,
-      1.6919474207703237E-7,
-      0.0
-    ]
-  },
-  "1.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.032823285093425095,
-      0.017567749359642493,
-      0.00953569612558252,
-      0.00551770091133988,
-      0.0030293015976168196,
-      0.001549985394612689,
-      7.405480702803172E-4,
-      3.3946115720947883E-4,
-      1.5261891454455137E-4,
-      6.777627865964975E-5,
-      2.964531823190911E-5,
-      1.2685961357983442E-5,
-      5.167356474156763E-6,
-      1.9133608596009917E-6,
-      6.277454175004915E-7,
-      1.7844980513463233E-7,
-      4.425157257373877E-8,
-      9.641969506147199E-9,
-      1.6020770235966064E-9,
-      1.5624526738630456E-10
-    ]
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/data/e2e-ceus-2014-CHICAGO_IL.json b/src/test/resources/data/e2e-ceus-2014-CHICAGO_IL.json
deleted file mode 100644
index c76adc634be63461fd1f863cc1994bbcb266592b..0000000000000000000000000000000000000000
--- a/src/test/resources/data/e2e-ceus-2014-CHICAGO_IL.json
+++ /dev/null
@@ -1,140 +0,0 @@
-{
-  "Peak Ground Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.030000793474534004,
-      0.01532909419113272,
-      0.008603610496732767,
-      0.005369313046242603,
-      0.0031668755818920168,
-      0.001646242186840541,
-      8.030518472148328E-4,
-      4.1226056387801065E-4,
-      2.2322969898608516E-4,
-      1.227466472490097E-4,
-      6.754583748567618E-5,
-      3.60723487940985E-5,
-      1.8097036042667562E-5,
-      8.224141240921387E-6,
-      3.276313653422391E-6,
-      1.0573090440391831E-6,
-      2.190836274575588E-7,
-      0.0,
-      0.0,
-      0.0
-    ]
-  },
-  "0.20 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.07219240401123704,
-      0.039176312426924306,
-      0.021882893928658345,
-      0.013515599620461732,
-      0.008367177935313119,
-      0.005021678399082942,
-      0.0027522986219314597,
-      0.0013559705042222052,
-      6.410501379492919E-4,
-      3.088083101009037E-4,
-      1.5246644151425097E-4,
-      7.571476193297178E-5,
-      3.746854608246455E-5,
-      1.7697950912654943E-5,
-      7.739615511089481E-6,
-      3.005871196383911E-6,
-      9.924783270142586E-7,
-      2.553547965733071E-7,
-      3.476456793598904E-8,
-      0.0
-    ]
-  },
-  "1.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.024659620057244643,
-      0.012822035614935447,
-      0.007220150962371335,
-      0.004603816939092045,
-      0.002928076207844721,
-      0.0017351221518407927,
-      8.76011109457373E-4,
-      3.586677041951207E-4,
-      1.2270362147568983E-4,
-      3.857525043333415E-5,
-      1.16796125607664E-5,
-      3.2050400901450724E-6,
-      9.922749502429663E-7,
-      3.457818963354513E-7,
-      1.0837153113922518E-7,
-      2.9282486300398405E-8,
-      6.825146364030429E-9,
-      1.3866935312128214E-9,
-      2.123130869220362E-10,
-      2.0208827237453218E-11
-    ]
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/data/e2e-ceus-2014-NEW_MADRID_MO.json b/src/test/resources/data/e2e-ceus-2014-NEW_MADRID_MO.json
deleted file mode 100644
index 616bd0fdd5257e09b53fe91e94954b23e6da338e..0000000000000000000000000000000000000000
--- a/src/test/resources/data/e2e-ceus-2014-NEW_MADRID_MO.json
+++ /dev/null
@@ -1,140 +0,0 @@
-{
-  "Peak Ground Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.11360860647978374,
-      0.08558888654712582,
-      0.0636348919517669,
-      0.048175461243720526,
-      0.03546490564292492,
-      0.02543883903820596,
-      0.017942148609298627,
-      0.012643858614709892,
-      0.00898314630632464,
-      0.0064696924425980025,
-      0.004753546424702675,
-      0.0035869752890240443,
-      0.0027571143091872784,
-      0.002082377925934649,
-      0.0014950906821616788,
-      9.234205999743636E-4,
-      3.3242148604371066E-4,
-      0.0,
-      0.0,
-      0.0
-    ]
-  },
-  "0.20 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.1595599296174357,
-      0.12396915518625558,
-      0.09664627029358874,
-      0.07678801901571936,
-      0.059175907279203695,
-      0.04384718159166913,
-      0.031209785842288056,
-      0.02158452191959841,
-      0.01470097785795453,
-      0.010004490653342723,
-      0.006907929713604936,
-      0.0049171238071118225,
-      0.0036497106052347968,
-      0.002820240102687582,
-      0.0022068393940988507,
-      0.001654469797772828,
-      0.0011158452181182306,
-      5.821627452235378E-4,
-      1.4544213923592264E-4,
-      0.0
-    ]
-  },
-  "1.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.06630868378199921,
-      0.041113722976115305,
-      0.025762085364357305,
-      0.017276145282289868,
-      0.011613010634376688,
-      0.007907380908755977,
-      0.005541999022381877,
-      0.004080760888321826,
-      0.003186550899744242,
-      0.002620266295064856,
-      0.0022021488945739055,
-      0.0018112666323315378,
-      0.0014098997183155785,
-      0.0010025973704042796,
-      6.127420401955225E-4,
-      3.1017111263634614E-4,
-      1.3407101664747356E-4,
-      4.977746404777477E-5,
-      1.512827376243945E-5,
-      3.1831117640473E-6
-    ]
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/data/e2e-ceus-2014-NEW_ORLEANS_LA.json b/src/test/resources/data/e2e-ceus-2014-NEW_ORLEANS_LA.json
deleted file mode 100644
index 84b682a14781c89285e67c6e6b628d6e5272b88b..0000000000000000000000000000000000000000
--- a/src/test/resources/data/e2e-ceus-2014-NEW_ORLEANS_LA.json
+++ /dev/null
@@ -1,140 +0,0 @@
-{
-  "Peak Ground Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.021114566242633036,
-      0.011130335122701961,
-      0.006378399555602344,
-      0.003887761925299397,
-      0.0021182590397661447,
-      0.0010093318134810874,
-      4.6810558780630663E-4,
-      2.3188435698050656E-4,
-      1.211938140399868E-4,
-      6.451716946848778E-5,
-      3.4396740686686E-5,
-      1.788657205908776E-5,
-      8.836798212162456E-6,
-      4.01378145146037E-6,
-      1.6186265835209448E-6,
-      5.3186018762965E-7,
-      1.1217887950457206E-7,
-      0.0,
-      0.0,
-      0.0
-    ]
-  },
-  "0.20 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.05063914744471663,
-      0.02658136671637341,
-      0.014935029738708732,
-      0.009434648929376873,
-      0.005891580003417341,
-      0.003397813662845249,
-      0.0017249585415697257,
-      8.01658886923735E-4,
-      3.6725832186558933E-4,
-      1.725096171774972E-4,
-      8.258681734561283E-5,
-      3.990854444143928E-5,
-      1.9221376727875825E-5,
-      8.92437551898379E-6,
-      3.894974974217309E-6,
-      1.529562984400811E-6,
-      5.171032980898653E-7,
-      1.3742795907445797E-7,
-      1.9370939360406516E-8,
-      0.0
-    ]
-  },
-  "1.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.019823233814793673,
-      0.010658084603908243,
-      0.00613719617698802,
-      0.003906099382933406,
-      0.0024067962752271797,
-      0.001329302591656879,
-      6.079584972565617E-4,
-      2.2725791672355362E-4,
-      7.332677350969076E-5,
-      2.2360061404676858E-5,
-      6.516148357827803E-6,
-      1.8025859879048082E-6,
-      6.098391701731616E-7,
-      2.2107211095090757E-7,
-      7.16462368928655E-8,
-      2.0171362712757422E-8,
-      4.9643690967684295E-9,
-      1.072696167180482E-9,
-      1.7546312651212785E-10,
-      1.617073949827492E-11
-    ]
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/data/e2e-ceus-2014-NEW_YORK_NY.json b/src/test/resources/data/e2e-ceus-2014-NEW_YORK_NY.json
deleted file mode 100644
index 6849ac1671e1dd00488dd73629425c283f93103c..0000000000000000000000000000000000000000
--- a/src/test/resources/data/e2e-ceus-2014-NEW_YORK_NY.json
+++ /dev/null
@@ -1,140 +0,0 @@
-{
-  "Peak Ground Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.039940997345117316,
-      0.02255124458334524,
-      0.013436060279386916,
-      0.008840332382958298,
-      0.0058606872372117275,
-      0.0038637936023039254,
-      0.002511825778632704,
-      0.0016093542313325,
-      0.0010078947168909625,
-      6.084687959255951E-4,
-      3.484525429109635E-4,
-      1.8627193834793078E-4,
-      9.135005185566646E-5,
-      4.02918745117034E-5,
-      1.5721206290642528E-5,
-      5.042510115334683E-6,
-      1.0494833958089443E-6,
-      0.0,
-      0.0,
-      0.0
-    ]
-  },
-  "0.20 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.08241221361254508,
-      0.049631764954165304,
-      0.030244825944945555,
-      0.019776490454905926,
-      0.012834378665118294,
-      0.008235635789376253,
-      0.005205982249678883,
-      0.0032436765810809265,
-      0.001982441970061481,
-      0.0011797774537677904,
-      6.774547995593991E-4,
-      3.7136613740999065E-4,
-      1.914589447541446E-4,
-      9.109451075598584E-5,
-      3.963761281900232E-5,
-      1.5362250557037032E-5,
-      5.122323692991916E-6,
-      1.3607527426236276E-6,
-      1.9580523552058164E-7,
-      0.0
-    ]
-  },
-  "1.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.02821785137132166,
-      0.014796991748089641,
-      0.007791484549826695,
-      0.004353517706010953,
-      0.002319882150387322,
-      0.0011815216611161423,
-      5.831948659050576E-4,
-      2.8521835106111047E-4,
-      1.386553099624596E-4,
-      6.66439715723032E-5,
-      3.140411524131777E-5,
-      1.425543496365522E-5,
-      6.049386647529715E-6,
-      2.305538119759978E-6,
-      7.731083985146002E-7,
-      2.240566769240742E-7,
-      5.673108865083253E-8,
-      1.2599285286043781E-8,
-      2.1018790208442337E-9,
-      2.0022993755315413E-10
-    ]
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/data/e2e-ceus-2018-BOSTON_MA.json b/src/test/resources/data/e2e-ceus-2018-BOSTON_MA.json
deleted file mode 100644
index bf91ef30a1d224ce393f86533d340c40704d23b9..0000000000000000000000000000000000000000
--- a/src/test/resources/data/e2e-ceus-2018-BOSTON_MA.json
+++ /dev/null
@@ -1,554 +0,0 @@
-{
-  "Peak Ground Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.03719782803009929,
-      0.023667258610165814,
-      0.015313162410869913,
-      0.010408841399089352,
-      0.0068686968433684745,
-      0.00436137568535513,
-      0.002661013783305198,
-      0.0015735732839648614,
-      9.048042716993099E-4,
-      5.058810440761678E-4,
-      2.7482128869334166E-4,
-      1.4460821137762301E-4,
-      7.284734130654263E-5,
-      3.427974425397358E-5,
-      1.4639724908085222E-5,
-      5.263086305178244E-6,
-      1.2651690995565259E-6,
-      0.0,
-      0.0,
-      0.0
-    ]
-  },
-  "0.10 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.0741205515579821,
-      0.052361968216244524,
-      0.03726111461235089,
-      0.027603630122559362,
-      0.02001959868088403,
-      0.014063104303894182,
-      0.009498166884182136,
-      0.00617201333620475,
-      0.003853982636129039,
-      0.0023094464844219936,
-      0.0013290226334179375,
-      7.364830757030269E-4,
-      3.9349474997524536E-4,
-      2.0187406786394973E-4,
-      9.93141710382119E-5,
-      4.5848522714215416E-5,
-      1.9242663105398952E-5,
-      6.761312180505328E-6,
-      1.3053186288677343E-6,
-      0.0
-    ]
-  },
-  "0.20 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.07331552133724369,
-      0.048697810099094345,
-      0.03234908822806329,
-      0.022421268910487974,
-      0.015065086774120297,
-      0.009696846537988583,
-      0.0059431086031976115,
-      0.003485767620187788,
-      0.001961074272731736,
-      0.0010596736430773317,
-      5.514504214320721E-4,
-      2.770890592306826E-4,
-      1.3410881274593915E-4,
-      6.189958416018404E-5,
-      2.70866711657409E-5,
-      1.0944133160125418E-5,
-      3.9459373797312155E-6,
-      1.1715018986071715E-6,
-      1.9065280594237936E-7,
-      0.0
-    ]
-  },
-  "0.30 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.06483577404163675,
-      0.040662917469523725,
-      0.025490951732710133,
-      0.016771560481582775,
-      0.010663139028381102,
-      0.006474258357150865,
-      0.00373244949550112,
-      0.002055205639652828,
-      0.0010842310520728067,
-      5.49412321471909E-4,
-      2.682917181600072E-4,
-      1.2655683467263063E-4,
-      5.746948309028856E-5,
-      2.480798764331593E-5,
-      1.0100008948959954E-5,
-      3.763962319921481E-6,
-      1.2409116489772335E-6,
-      3.3524081050966454E-7,
-      4.9730447638096246E-8,
-      0.0
-    ]
-  },
-  "0.40 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.05645372225988383,
-      0.03397733851232247,
-      0.020500979273630673,
-      0.013068444086229983,
-      0.00805210522175721,
-      0.004734550130674918,
-      0.002637693514626852,
-      0.001399302504547204,
-      7.083636353799681E-4,
-      3.4295932084069163E-4,
-      1.5959959762910215E-4,
-      7.175220040763003E-5,
-      3.109560400581143E-5,
-      1.280599614723455E-5,
-      4.953874926253643E-6,
-      1.7397193620345517E-6,
-      5.334637241371223E-7,
-      1.3210981361928383E-7,
-      1.7712444428634643E-8,
-      0.0
-    ]
-  },
-  "0.50 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.048738311214634504,
-      0.028455571715278627,
-      0.016745960833575504,
-      0.010473190311250663,
-      0.006334123731354701,
-      0.003651461640833075,
-      0.0019893995111131507,
-      0.0010282558732606726,
-      5.046696291958199E-4,
-      2.3580328981636452E-4,
-      1.0568057380429643E-4,
-      4.5799411549643255E-5,
-      1.9192769647338542E-5,
-      7.652492786710101E-6,
-      2.8564353930031555E-6,
-      9.587096141630674E-7,
-      2.773684346245456E-7,
-      6.390130608409651E-8,
-      7.852691107117294E-9,
-      0.0
-    ]
-  },
-  "0.75 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.03125294320280928,
-      0.017422645929040106,
-      0.009937457010232537,
-      0.006074845684529909,
-      0.00358727419576162,
-      0.002011030121271587,
-      0.001059272931601267,
-      5.262671107854079E-4,
-      2.4727746621562357E-4,
-      1.1056956102203355E-4,
-      4.756927989441444E-5,
-      1.9921586689284016E-5,
-      8.108335764268993E-6,
-      3.1342968860396625E-6,
-      1.1246562492539955E-6,
-      3.5829580262310046E-7,
-      9.764254637925388E-8,
-      2.1590318464846506E-8,
-      3.5496493900669946E-9,
-      3.7728872065909646E-10
-    ]
-  },
-  "1.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.020789446970782444,
-      0.011322197954381743,
-      0.00633878892260081,
-      0.0038044103165930264,
-      0.0021944078518924977,
-      0.001194215212973865,
-      6.073661760775952E-4,
-      2.907518876463605E-4,
-      1.3188701111107467E-4,
-      5.725176141036565E-5,
-      2.4062567967420102E-5,
-      9.877094444705188E-6,
-      3.92389741021437E-6,
-      1.4653813719581553E-6,
-      5.027151908380275E-7,
-      1.5166483692354423E-7,
-      3.869268117024299E-8,
-      7.93856870321778E-9,
-      1.1856644067969633E-9,
-      1.0320802914840819E-10
-    ]
-  },
-  "2.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.007213091163887232,
-      0.00380225896580305,
-      0.0020235838757684498,
-      0.0011414761247160578,
-      6.084707586700407E-4,
-      3.017955150950776E-4,
-      1.3886251645974987E-4,
-      6.032523806329062E-5,
-      2.5119563143842472E-5,
-      1.0160303221939256E-5,
-      4.01277238755783E-6,
-      1.5365295517090462E-6,
-      5.545186047715528E-7,
-      1.818758144813368E-7,
-      5.288964061702142E-8,
-      1.2954698850587626E-8,
-      2.5189601939112602E-9,
-      3.496341716843733E-10,
-      2.2758655416762796E-11,
-      5.504493344864692E-14
-    ]
-  },
-  "3.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.003459299013644235,
-      0.0017143565999640023,
-      8.452071998700303E-4,
-      4.439343353178212E-4,
-      2.1998519477046423E-4,
-      1.017457150382508E-4,
-      4.4045898830977315E-5,
-      1.82454536220755E-5,
-      7.332076224103969E-6,
-      2.8713988338739623E-6,
-      1.0877780291921626E-6,
-      3.8833907537867887E-7,
-      1.267131073697397E-7,
-      3.6264729659783996E-8,
-      8.793669575931305E-9,
-      1.6803539304039363E-9,
-      2.2516216123060808E-10,
-      1.4893122438182753E-11,
-      8.632676397842363E-14,
-      0.0
-    ]
-  },
-  "4.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.002119854675990207,
-      9.871113734134253E-4,
-      4.530881219287105E-4,
-      2.2284135916506928E-4,
-      1.030686146387005E-4,
-      4.4383757963225474E-5,
-      1.7865336045693397E-5,
-      6.8834501822970716E-6,
-      2.5746572499155163E-6,
-      9.334517287645332E-7,
-      3.206572222787932E-7,
-      1.013043252752202E-7,
-      2.826226078202635E-8,
-      6.62292628921489E-9,
-      1.2450862759793423E-9,
-      1.6864821598004415E-10,
-      1.2657242297637455E-11,
-      1.8899254011561584E-13,
-      0.0,
-      0.0
-    ]
-  },
-  "5.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.0013652909220539628,
-      5.996895055070549E-4,
-      2.593476276843961E-4,
-      1.2140605124663753E-4,
-      5.35822744787118E-5,
-      2.210899757209054E-5,
-      8.592954323401141E-6,
-      3.2188048673166713E-6,
-      1.1709380654004842E-6,
-      4.072724921174932E-7,
-      1.3245917677432122E-7,
-      3.853911095776264E-8,
-      9.631144898091261E-9,
-      1.9439397199184663E-9,
-      2.9808476102348383E-10,
-      2.9051445323935453E-11,
-      1.1070825552321884E-12,
-      0.0,
-      0.0,
-      0.0
-    ]
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/data/e2e-ceus-2018-CHICAGO_IL.json b/src/test/resources/data/e2e-ceus-2018-CHICAGO_IL.json
deleted file mode 100644
index 1b45202f9c0acc4326acd93e8e6aae4e53a41e99..0000000000000000000000000000000000000000
--- a/src/test/resources/data/e2e-ceus-2018-CHICAGO_IL.json
+++ /dev/null
@@ -1,554 +0,0 @@
-{
-  "Peak Ground Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.021264020376614852,
-      0.012264089816136524,
-      0.007584340436122299,
-      0.005068926266248056,
-      0.003283928716955741,
-      0.001999734264728885,
-      0.001127737690206953,
-      5.982460995405842E-4,
-      3.0611559502266144E-4,
-      1.5541913102072946E-4,
-      7.988741916428877E-5,
-      4.1360233115535736E-5,
-      2.0954666993094002E-5,
-      9.966154201576395E-6,
-      4.2818650418774916E-6,
-      1.5382947591757766E-6,
-      3.673720344226874E-7,
-      0.0,
-      0.0,
-      0.0
-    ]
-  },
-  "0.10 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.05124498227998555,
-      0.03175318168213795,
-      0.020337087421026634,
-      0.014041120435123624,
-      0.009642724887748777,
-      0.006474396358450664,
-      0.004172684500406651,
-      0.0025561768831713393,
-      0.001479569461422493,
-      8.116329886308891E-4,
-      4.2773414608150863E-4,
-      2.204913380667172E-4,
-      1.1244301785226663E-4,
-      5.648413262651814E-5,
-      2.7680022329237745E-5,
-      1.2822267662126433E-5,
-      5.397881054984442E-6,
-      1.8942108983318865E-6,
-      3.6330988115770174E-7,
-      0.0
-    ]
-  },
-  "0.20 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.05402187816561081,
-      0.03152545761806686,
-      0.01900325442882781,
-      0.012482962851307663,
-      0.008184670270149514,
-      0.0052578996137468805,
-      0.0032287502528148253,
-      0.0018602490952470243,
-      9.898453371220183E-4,
-      4.836542395864643E-4,
-      2.1965139408916545E-4,
-      9.554086520960352E-5,
-      4.108804214073931E-5,
-      1.7620452318142746E-5,
-      7.435187517353789E-6,
-      2.946955017442348E-6,
-      1.0439095482939767E-6,
-      3.035773929485371E-7,
-      4.827064078436792E-8,
-      0.0
-    ]
-  },
-  "0.30 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.04908213697175477,
-      0.027444649563894526,
-      0.015981137445395657,
-      0.010254037945347612,
-      0.006604871124135179,
-      0.00418856716424755,
-      0.002543120064282458,
-      0.0014384765315610685,
-      7.362451359381657E-4,
-      3.349993597543791E-4,
-      1.3611227929530956E-4,
-      5.103193886959174E-5,
-      1.874143945704295E-5,
-      7.0009556289351895E-6,
-      2.6603814336617634E-6,
-      9.565135783716132E-7,
-      3.060931385547202E-7,
-      8.041162244395522E-8,
-      1.1591758239998677E-8,
-      0.0
-    ]
-  },
-  "0.40 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.04402774234655989,
-      0.02415042928465309,
-      0.013898304918704325,
-      0.008869124635754145,
-      0.005698272838104261,
-      0.003607083257438182,
-      0.002182066124286231,
-      0.0012223125996889278,
-      6.107759925384525E-4,
-      2.647293451867449E-4,
-      9.912833877092988E-5,
-      3.301260383103079E-5,
-      1.0576187746850235E-5,
-      3.542144543483167E-6,
-      1.2525606103539443E-6,
-      4.232839975726258E-7,
-      1.2587378023422552E-7,
-      3.0221732377853865E-8,
-      3.909257744119777E-9,
-      0.0
-    ]
-  },
-  "0.50 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.03898800768334817,
-      0.02120828023228193,
-      0.012196916674339557,
-      0.007806960453291059,
-      0.005033655949261075,
-      0.0031882110745530775,
-      0.0019180530605802863,
-      0.0010613880050640992,
-      5.206739856480161E-4,
-      2.192234595639171E-4,
-      7.809152467330038E-5,
-      2.3989059242127812E-5,
-      6.854633215442579E-6,
-      2.0800040255801554E-6,
-      6.991719646717317E-7,
-      2.2572782555046868E-7,
-      6.326986790473221E-8,
-      1.4059041913186694E-8,
-      1.6512762216604485E-9,
-      0.0
-    ]
-  },
-  "0.75 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.02561587305900625,
-      0.014003810456042915,
-      0.008263586139172661,
-      0.005446364717862985,
-      0.003602861093480386,
-      0.002309065034985536,
-      0.0013785051891790788,
-      7.437306568043768E-4,
-      3.5136259211043694E-4,
-      1.409984079956299E-4,
-      4.69634815738836E-5,
-      1.3061251119314666E-5,
-      3.1903060248374335E-6,
-      8.124518249420266E-7,
-      2.552001888974301E-7,
-      7.778776121561507E-8,
-      2.042205661183465E-8,
-      4.283748523103565E-9,
-      6.568921837529929E-10,
-      6.409969598794405E-11
-    ]
-  },
-  "1.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.01767691958012256,
-      0.009852525293618264,
-      0.005985311839477659,
-      0.0040377518188020834,
-      0.0027011416874513027,
-      0.0017174735153483163,
-      9.970399620524062E-4,
-      5.141116423860297E-4,
-      2.289843822182068E-4,
-      8.587162573694086E-5,
-      2.6555032019573817E-5,
-      6.7547383197348575E-6,
-      1.5274570280502053E-6,
-      3.4743993541622455E-7,
-      1.0623646756329828E-7,
-      3.060266082666156E-8,
-      7.45152822159093E-9,
-      1.4415951189784636E-9,
-      2.0129740049290645E-10,
-      1.6160463363870904E-11
-    ]
-  },
-  "2.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.007395098412112649,
-      0.0045553403047594474,
-      0.003023460201251206,
-      0.002109509227864717,
-      0.0013887485499917698,
-      8.288811933213284E-4,
-      4.310784451517004E-4,
-      1.9022226754202362E-4,
-      6.956079588283172E-5,
-      2.034805721608005E-5,
-      4.544706234812249E-6,
-      8.186896598291009E-7,
-      1.2601650165512773E-7,
-      3.240466857856165E-8,
-      8.962854020048362E-9,
-      2.110598417745588E-9,
-      3.9959188299573453E-10,
-      5.534722708491084E-11,
-      4.18631149398323E-12,
-      1.8054582685844605E-14
-    ]
-  },
-  "3.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.004407469927727124,
-      0.002886851024526826,
-      0.0019116106716479022,
-      0.001270269727773496,
-      7.707368147237052E-4,
-      4.1069284571699263E-4,
-      1.8509610072607753E-4,
-      6.932463108570887E-5,
-      2.0933960471560332E-5,
-      4.835989560750748E-6,
-      8.467520031015899E-7,
-      1.1409935834744506E-7,
-      2.1345881199235338E-8,
-      5.8051954792463635E-9,
-      1.3867763636631736E-9,
-      2.6906378600230406E-10,
-      3.866987086911414E-11,
-      3.2339891514094378E-12,
-      2.8037974787742438E-14,
-      0.0
-    ]
-  },
-  "4.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.003359345869368896,
-      0.0022076355721120755,
-      0.0013966186749277134,
-      8.70242589375344E-4,
-      4.831823461127745E-4,
-      2.2879482847632768E-4,
-      8.892959691051302E-5,
-      2.777639265446681E-5,
-      6.6367227903913515E-6,
-      1.1367860321196673E-6,
-      1.4671963689687293E-7,
-      1.845209726124043E-8,
-      4.487307963046206E-9,
-      1.0557789509954764E-9,
-      2.0721113750277762E-10,
-      3.1061915378393275E-11,
-      2.944972658145181E-12,
-      6.051421859509784E-14,
-      0.0,
-      0.0
-    ]
-  },
-  "5.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.0027070242713047566,
-      0.0017444643397515312,
-      0.001044653015894128,
-      6.067854699651329E-4,
-      3.067975660729718E-4,
-      1.2994387905115032E-4,
-      4.467809963616576E-5,
-      1.217383796453383E-5,
-      2.505670815007541E-6,
-      3.805048262459333E-7,
-      4.040470496244398E-8,
-      6.2545619672637E-9,
-      1.5543607256152297E-9,
-      3.287376498375291E-10,
-      5.553219360272024E-11,
-      6.5117604540751396E-12,
-      3.4225377966407726E-13,
-      0.0,
-      0.0,
-      0.0
-    ]
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/data/e2e-ceus-2018-NEW_MADRID_MO.json b/src/test/resources/data/e2e-ceus-2018-NEW_MADRID_MO.json
deleted file mode 100644
index 73fca99f367c57c15049c018f02ef0e576c51040..0000000000000000000000000000000000000000
--- a/src/test/resources/data/e2e-ceus-2018-NEW_MADRID_MO.json
+++ /dev/null
@@ -1,554 +0,0 @@
-{
-  "Peak Ground Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.10816888374866891,
-      0.08422353206991366,
-      0.06464181033216727,
-      0.050390578035085336,
-      0.03823109559132179,
-      0.02820527495803257,
-      0.020335940488213307,
-      0.014505947982267555,
-      0.01032717869829684,
-      0.007393826861182158,
-      0.005378198195708943,
-      0.0040235369545032875,
-      0.0031073437891977994,
-      0.0024187603251237116,
-      0.0017826835978068279,
-      0.0011047305011870452,
-      4.3336689896119164E-4,
-      0.0,
-      0.0,
-      0.0
-    ]
-  },
-  "0.10 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.15339673173217155,
-      0.12894747790582362,
-      0.10846904880705736,
-      0.09219289310951231,
-      0.07640959963429654,
-      0.06122039396413928,
-      0.04721007365263329,
-      0.035176183822515625,
-      0.025456086506818375,
-      0.01801270184133862,
-      0.012579439844366382,
-      0.008775008650998525,
-      0.006196794625640934,
-      0.004490807768281556,
-      0.003380646135806061,
-      0.0026056110127047256,
-      0.0019482415993401655,
-      0.0012381212113377798,
-      4.1328668419576137E-4,
-      0.0
-    ]
-  },
-  "0.20 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.15057778814594366,
-      0.12011346460354924,
-      0.09467372061369361,
-      0.07537259318375111,
-      0.05807977179337729,
-      0.043102708085572185,
-      0.030854671741738993,
-      0.02154217624948156,
-      0.014819443221350407,
-      0.010152041733068206,
-      0.0070232371076197715,
-      0.004993043426609302,
-      0.003702647666887208,
-      0.00286494210424394,
-      0.002259943855140799,
-      0.001718017639007772,
-      0.0011547941604939675,
-      5.976671832501237E-4,
-      1.518726156608888E-4,
-      0.0
-    ]
-  },
-  "0.30 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.13830663874729396,
-      0.10431577653061282,
-      0.07710056483645562,
-      0.057922910918274256,
-      0.04217552841076041,
-      0.02975602475961701,
-      0.02046831492248294,
-      0.013932373308392317,
-      0.009503618174895433,
-      0.006585144592438464,
-      0.004712634641956262,
-      0.0035341899884043923,
-      0.0027728956977478973,
-      0.0022123961087117537,
-      0.0017121437451715772,
-      0.0012003818909913078,
-      7.011325408225236E-4,
-      3.046361963882844E-4,
-      6.502931900542027E-5,
-      0.0
-    ]
-  },
-  "0.40 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.1246268152109404,
-      0.08943513572986074,
-      0.0629400384040983,
-      0.045532768636098384,
-      0.032122939456332544,
-      0.022136984977665447,
-      0.015020476833571694,
-      0.010203722258938177,
-      0.007039922405529329,
-      0.00500770771866049,
-      0.0037289895488973246,
-      0.002921588995546685,
-      0.0023607336129140874,
-      0.001877907536727093,
-      0.0013845320323713594,
-      8.789757247673729E-4,
-      4.481185026228142E-4,
-      1.6820221554471245E-4,
-      3.132562341573633E-5,
-      0.0
-    ]
-  },
-  "0.50 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.1108984915561141,
-      0.07634941492736337,
-      0.05188825106332083,
-      0.03667641367596946,
-      0.025445063503897504,
-      0.01736140446589121,
-      0.011754899260570714,
-      0.008043300323787386,
-      0.005651365889586987,
-      0.004139974479155932,
-      0.0031957824680103127,
-      0.002580838039134638,
-      0.0021049355366054927,
-      0.0016356503291031436,
-      0.0011342872804574128,
-      6.565627565947439E-4,
-      3.0097040909688225E-4,
-      1.0176371948157926E-4,
-      1.716364259365614E-5,
-      0.0
-    ]
-  },
-  "0.75 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.0776353274360031,
-      0.049742783288724855,
-      0.032233328911317694,
-      0.022238528228438314,
-      0.0152764228126765,
-      0.010483362175696414,
-      0.00727237482087794,
-      0.005205324729636322,
-      0.0039024711306040955,
-      0.0030845155978998793,
-      0.002545076300052722,
-      0.0021205216403306086,
-      0.0016934343647546435,
-      0.001219743796149023,
-      7.532711146187673E-4,
-      3.832688270882948E-4,
-      1.5714242005791907E-4,
-      5.05750202261566E-5,
-      1.1921880032962696E-5,
-      1.9264878378535364E-6
-    ]
-  },
-  "1.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.05463131833821259,
-      0.03371037703177789,
-      0.021450768931862617,
-      0.014746828875423506,
-      0.010213845005261731,
-      0.007169702469273294,
-      0.005173210522192378,
-      0.003909137006695669,
-      0.003115396066475222,
-      0.002594933614924358,
-      0.0021924433098422774,
-      0.0017922675710438448,
-      0.0013445361652679399,
-      8.815802097206501E-4,
-      4.90757904262607E-4,
-      2.2639747115251913E-4,
-      8.498289972656564E-5,
-      2.5018909352060557E-5,
-      5.510792312208342E-6,
-      7.964819445249532E-7
-    ]
-  },
-  "2.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.020699991843994212,
-      0.012554618065932957,
-      0.008178658694337227,
-      0.0059313554367949614,
-      0.00448158299266843,
-      0.003541941302564985,
-      0.0029329470486893785,
-      0.0025233540012966384,
-      0.002192484786170691,
-      0.00184393834646754,
-      0.0014385437862412635,
-      0.0010085293507965882,
-      6.202223088945296E-4,
-      3.2649688301773685E-4,
-      1.4497014895339786E-4,
-      5.259152188687497E-5,
-      1.500143309570342E-5,
-      3.122793670297018E-6,
-      4.269689880765699E-7,
-      1.2150476590051678E-9
-    ]
-  },
-  "3.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.011056260100013236,
-      0.006959270109852619,
-      0.004862213403180668,
-      0.0038165061493014296,
-      0.0031474497891072046,
-      0.0027028554915409834,
-      0.0023768526522002452,
-      0.002076645948709571,
-      0.001731982804333237,
-      0.0013337854852670807,
-      9.271137609502163E-4,
-      5.689834337433973E-4,
-      3.004095632312156E-4,
-      1.3262840850378205E-4,
-      4.807264502906383E-5,
-      1.352911826572071E-5,
-      2.759650900278935E-6,
-      3.672353409800468E-7,
-      2.300524791236422E-9,
-      0.0
-    ]
-  },
-  "4.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.0075780036930967725,
-      0.005000065314404812,
-      0.0037101189239806716,
-      0.0030722340632835074,
-      0.0026576079417597108,
-      0.00235379777727167,
-      0.002066151767378093,
-      0.0017255475301591367,
-      0.001323293136950354,
-      9.097942102197988E-4,
-      5.486083281518491E-4,
-      2.8313096856549596E-4,
-      1.2210058865818113E-4,
-      4.284879917897786E-5,
-      1.1818861182808685E-5,
-      2.3650082265285026E-6,
-      3.2103604153884727E-7,
-      5.1421457125432055E-9,
-      0.0,
-      0.0
-    ]
-  },
-  "5.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.0057225431451585155,
-      0.003994730410095688,
-      0.0031338064589724,
-      0.002701323083435355,
-      0.00239817765770089,
-      0.002127042381239025,
-      0.0018108707733181693,
-      0.0014281857513492669,
-      0.0010185306421607607,
-      6.432078356852997E-4,
-      3.506395593869217E-4,
-      1.60872663896314E-4,
-      6.071555323258482E-5,
-      1.811773646110984E-5,
-      4.042309811293591E-6,
-      6.186490069794907E-7,
-      3.9668834504598904E-8,
-      0.0,
-      0.0,
-      0.0
-    ]
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/data/e2e-ceus-2018-NEW_ORLEANS_LA.json b/src/test/resources/data/e2e-ceus-2018-NEW_ORLEANS_LA.json
deleted file mode 100644
index 1798acf9d102d775bd106b7c397271498e7c2f5e..0000000000000000000000000000000000000000
--- a/src/test/resources/data/e2e-ceus-2018-NEW_ORLEANS_LA.json
+++ /dev/null
@@ -1,554 +0,0 @@
-{
-  "Peak Ground Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.014731911957814514,
-      0.008782316177289503,
-      0.005449372029503126,
-      0.003554259195395367,
-      0.002197848751790969,
-      0.0012585024463581673,
-      6.636997343196057E-4,
-      3.303666751944742E-4,
-      1.6020218790209985E-4,
-      7.803459774756591E-5,
-      3.875636895540925E-5,
-      1.9435267707959688E-5,
-      9.581893618070507E-6,
-      4.475912393790965E-6,
-      1.9109494717811742E-6,
-      6.90196321151442E-7,
-      1.672474840256831E-7,
-      0.0,
-      0.0,
-      0.0
-    ]
-  },
-  "0.10 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.032206921334783506,
-      0.020264867667995325,
-      0.013408403012152511,
-      0.009482347609461107,
-      0.006567337021051429,
-      0.004351157069714817,
-      0.002711447749751209,
-      0.0015861228769682332,
-      8.736966252911218E-4,
-      4.5795470074324143E-4,
-      2.3241950865826643E-4,
-      1.1625727329800248E-4,
-      5.7698405228082076E-5,
-      2.8188986685101067E-5,
-      1.3451536447349894E-5,
-      6.096689891386179E-6,
-      2.5323139130242487E-6,
-      8.858762217545693E-7,
-      1.7111128853995496E-7,
-      0.0
-    ]
-  },
-  "0.20 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.035798282970861864,
-      0.0209861854627501,
-      0.012933923382679693,
-      0.008655029889951982,
-      0.0057038256403972335,
-      0.003597837054696895,
-      0.002116857746431244,
-      0.001148828700472069,
-      5.711918337548653E-4,
-      2.6134462684424166E-4,
-      1.1270912466693351E-4,
-      4.765501353333767E-5,
-      2.0326402033177926E-5,
-      8.713807170355084E-6,
-      3.6776804171156958E-6,
-      1.4598654161661941E-6,
-      5.215376092519055E-7,
-      1.5398722777647872E-7,
-      2.4937118524540665E-8,
-      0.0
-    ]
-  },
-  "0.30 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.034060802086971244,
-      0.01921134327022931,
-      0.011412709209564475,
-      0.007432026775217859,
-      0.004797922398899519,
-      0.002986377719740281,
-      0.001735073762442523,
-      9.175918030472209E-4,
-      4.327595736287146E-4,
-      1.8090813491592657E-4,
-      6.837496815533034E-5,
-      2.4713359166522155E-5,
-      9.129120052015368E-6,
-      3.5127160988214017E-6,
-      1.3696986513533115E-6,
-      5.002359844873618E-7,
-      1.6269104355438725E-7,
-      4.351680512780746E-8,
-      6.4085382181032064E-9,
-      0.0
-    ]
-  },
-  "0.40 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.03181679877842622,
-      0.017685583819471547,
-      0.010390369387388767,
-      0.006723283114161234,
-      0.0043226455858621565,
-      0.0026848019323474867,
-      0.0015582922228201924,
-      8.192587049332875E-4,
-      3.776715410083894E-4,
-      1.498142040301312E-4,
-      5.154257467616394E-5,
-      1.6235684768146693E-5,
-      5.209616752061741E-6,
-      1.8153703120703974E-6,
-      6.656536036272169E-7,
-      2.2901094695762183E-7,
-      6.92950951233589E-8,
-      1.7004504265928756E-8,
-      2.274333252570187E-9,
-      0.0
-    ]
-  },
-  "0.50 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.029068674372345157,
-      0.01609496098902073,
-      0.00946355433506334,
-      0.006140784665057359,
-      0.003958262245200038,
-      0.00245790947474538,
-      0.001420616440394649,
-      7.420225011247669E-4,
-      3.388169208810985E-4,
-      1.315057199394695E-4,
-      4.3005436030926106E-5,
-      1.2319325062089215E-5,
-      3.439752131366643E-6,
-      1.0855085613442008E-6,
-      3.809419581545633E-7,
-      1.2540159178010006E-7,
-      3.582848036781198E-8,
-      8.206470420326698E-9,
-      1.008541937266548E-9,
-      0.0
-    ]
-  },
-  "0.75 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.02010095367293732,
-      0.011309812100267687,
-      0.006842309335880805,
-      0.004552365457875496,
-      0.0029862498777872195,
-      0.0018617703801090584,
-      0.0010643411405855984,
-      5.442733996204853E-4,
-      2.419706982911033E-4,
-      9.068867353653123E-5,
-      2.8019637764384E-5,
-      7.233362777529319E-6,
-      1.6827522865806391E-6,
-      4.4748952577709806E-7,
-      1.487047008973476E-7,
-      4.65010243496118E-8,
-      1.2563873509305451E-8,
-      2.773604952772429E-9,
-      4.5618878818541864E-10,
-      4.843732227609408E-11
-    ]
-  },
-  "1.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.014447150298184134,
-      0.008335011597021746,
-      0.005176102477509522,
-      0.003494053354294506,
-      0.002293268871962222,
-      0.0014070370944628183,
-      7.793147233833503E-4,
-      3.807389795239786E-4,
-      1.5983570752318318E-4,
-      5.6109128729125423E-5,
-      1.6135411006247205E-5,
-      3.8104585886561303E-6,
-      8.312075346119252E-7,
-      2.0427666083583613E-7,
-      6.609829932741624E-8,
-      1.9636389680361794E-8,
-      4.980487599732067E-9,
-      1.021242577612323E-9,
-      1.5263984073563293E-10,
-      1.3267677468204803E-11
-    ]
-  },
-  "2.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.0068175563986434245,
-      0.0042894508198295265,
-      0.002806507924332561,
-      0.0018964968195514242,
-      0.0011966576714217368,
-      6.796383699004265E-4,
-      3.3492285140952424E-4,
-      1.4005854045786852E-4,
-      4.856367696716421E-5,
-      1.3422217228990641E-5,
-      2.8677493535579206E-6,
-      4.968145828100208E-7,
-      8.509450364481899E-8,
-      2.4005649839245932E-8,
-      6.869720696819691E-9,
-      1.6723686755513474E-9,
-      3.252376947180755E-10,
-      4.518140245823717E-11,
-      2.9474381501840072E-12,
-      6.48477555903493E-15
-    ]
-  },
-  "3.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.004271923359490316,
-      0.002749361201548368,
-      0.001744863797851559,
-      0.0011111824827628432,
-      6.440264076057469E-4,
-      3.2701526879441587E-4,
-      1.4049973645480346E-4,
-      5.026479693045973E-5,
-      1.4490054558871037E-5,
-      3.220372594145978E-6,
-      5.486712740516592E-7,
-      7.829441647890905E-8,
-      1.6916997904665626E-8,
-      4.743370410135989E-9,
-      1.1395801276007213E-9,
-      2.1718684935642593E-10,
-      2.918556179697748E-11,
-      1.9212567096672586E-12,
-      1.0410460274318405E-14,
-      0.0
-    ]
-  },
-  "4.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.003298910375445729,
-      0.0020832039264608144,
-      0.0012544854768410788,
-      7.482867288657207E-4,
-      3.965282569109258E-4,
-      1.7889243718867656E-4,
-      6.632298176817632E-5,
-      1.9798102509064922E-5,
-      4.54053490426952E-6,
-      7.692552748003744E-7,
-      9.926743585181433E-8,
-      1.4614466826490085E-8,
-      3.7223252154200326E-9,
-      8.607877576635478E-10,
-      1.608925758723033E-10,
-      2.1833757368970004E-11,
-      1.6297793455437765E-12,
-      2.5508706159705865E-14,
-      0.0,
-      0.0
-    ]
-  },
-  "5.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.0026458965035063577,
-      0.0016210509863250572,
-      9.233827027312591E-4,
-      5.141574064252246E-4,
-      2.4906636418621655E-4,
-      1.0108456106687919E-4,
-      3.331329855245664E-5,
-      8.68581790670762E-6,
-      1.7334282890542233E-6,
-      2.6178097670634564E-7,
-      3.01511895266719E-8,
-      5.16553365155272E-9,
-      1.2627524188158213E-9,
-      2.5202808585113546E-10,
-      3.842703970856306E-11,
-      3.7733471316181584E-12,
-      1.4719608661140192E-13,
-      0.0,
-      0.0,
-      0.0
-    ]
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/data/e2e-ceus-2018-NEW_YORK_NY.json b/src/test/resources/data/e2e-ceus-2018-NEW_YORK_NY.json
deleted file mode 100644
index c1983d6636e24b38e126a0e7599b0b0f3e9c37f9..0000000000000000000000000000000000000000
--- a/src/test/resources/data/e2e-ceus-2018-NEW_YORK_NY.json
+++ /dev/null
@@ -1,554 +0,0 @@
-{
-  "Peak Ground Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.02829389271932778,
-      0.017711042708756473,
-      0.01156565565480321,
-      0.00809049307898385,
-      0.005598884322897253,
-      0.0037915083180121603,
-      0.0024984311062644917,
-      0.0016048394752264852,
-      0.001001232963870611,
-      6.022356953459527E-4,
-      3.4618230640245484E-4,
-      1.8836300189680618E-4,
-      9.576288459477561E-5,
-      4.456569564473599E-5,
-      1.857289804620306E-5,
-      6.481966080220834E-6,
-      1.51720952339493E-6,
-      0.0,
-      0.0,
-      0.0
-    ]
-  },
-  "0.10 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.058729300546277445,
-      0.039943506412954265,
-      0.027709233948037076,
-      0.020318292343035223,
-      0.01477719926618384,
-      0.010570532465371395,
-      0.007390479785524311,
-      0.005046395581906314,
-      0.0033520254715720564,
-      0.002156006663908199,
-      0.001337933781230503,
-      7.984003833216016E-4,
-      4.555199364581012E-4,
-      2.459309705443295E-4,
-      1.2499357625651598E-4,
-      5.858197465267374E-5,
-      2.46018704372497E-5,
-      8.56818298915199E-6,
-      1.6355379276899419E-6,
-      0.0
-    ]
-  },
-  "0.20 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.05962216177205408,
-      0.038140460874701874,
-      0.024716748303657894,
-      0.016955650445756486,
-      0.011422326857049116,
-      0.007492743343268559,
-      0.004767196407242438,
-      0.002952502755144304,
-      0.0017767796631251549,
-      0.0010336672402985949,
-      5.782024149573338E-4,
-      3.094461507185009E-4,
-      1.5737245101904784E-4,
-      7.524336204323012E-5,
-      3.368000984911893E-5,
-      1.3797385470657923E-5,
-      5.020649361223323E-6,
-      1.502510433107244E-6,
-      2.4622622529513314E-7,
-      0.0
-    ]
-  },
-  "0.30 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.05369738940117226,
-      0.03261370977447254,
-      0.020051028009356965,
-      0.01308859993093001,
-      0.008338581882794013,
-      0.005142039340059907,
-      0.0030624477970446905,
-      0.0017727793607268884,
-      9.96627093214204E-4,
-      5.413639176784675E-4,
-      2.826163737658998E-4,
-      1.412326314651931E-4,
-      6.718506290881915E-5,
-      3.0091002365825703E-5,
-      1.2622511296288417E-5,
-      4.821457545234655E-6,
-      1.6197967950526324E-6,
-      4.427734052296507E-7,
-      6.584898557391433E-8,
-      0.0
-    ]
-  },
-  "0.40 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.047695270322165695,
-      0.02798464185022414,
-      0.016639225953416086,
-      0.01053774129388575,
-      0.006491270314829673,
-      0.0038512780463100618,
-      0.00219467945570211,
-      0.001210804282940969,
-      6.476355302220114E-4,
-      3.349078709241479E-4,
-      1.6692550206322843E-4,
-      7.997094408904903E-5,
-      3.6586112817833395E-5,
-      1.575821685178826E-5,
-      6.3178578270081134E-6,
-      2.2779534750207006E-6,
-      7.102357922446536E-7,
-      1.7695627915702463E-7,
-      2.3665285210110085E-8,
-      0.0
-    ]
-  },
-  "0.50 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.04190559394993358,
-      0.02399684058224154,
-      0.013959869145861566,
-      0.008674037395327084,
-      0.005231024213201314,
-      0.0030263986113763866,
-      0.0016727231333997627,
-      8.904237464833407E-4,
-      4.580848875240822E-4,
-      2.2795861795961406E-4,
-      1.0979868955998586E-4,
-      5.113511253507295E-5,
-      2.2823351554968237E-5,
-      9.568422069089796E-6,
-      3.70500819040155E-6,
-      1.2741643263960794E-6,
-      3.7329203379145397E-7,
-      8.61461585348172E-8,
-      1.0557234635517332E-8,
-      0.0
-    ]
-  },
-  "0.75 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.027519213188592188,
-      0.015195168026914821,
-      0.00857219559506643,
-      0.005179341271911629,
-      0.0030234260193466676,
-      0.001682976747665575,
-      8.894487473405298E-4,
-      4.509522579875714E-4,
-      2.2109542177425458E-4,
-      1.0549993184015232E-4,
-      4.923233772204758E-5,
-      2.242680879329472E-5,
-      9.81095558267095E-6,
-      4.001656275350407E-6,
-      1.4885370908351195E-6,
-      4.851271327851365E-7,
-      1.3375218668979997E-7,
-      2.9775361861130566E-8,
-      4.942441874876767E-9,
-      5.306924272517018E-10
-    ]
-  },
-  "1.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.018676434346159728,
-      0.010072210372823335,
-      0.005539442793214786,
-      0.0032604845850421225,
-      0.001845072214097527,
-      9.913083964879644E-4,
-      5.047180994352556E-4,
-      2.472163421970759E-4,
-      1.1789215315501649E-4,
-      5.515696301723647E-5,
-      2.5352951024191836E-5,
-      1.1346074338774546E-5,
-      4.831366033414873E-6,
-      1.8967841747314576E-6,
-      6.725537850098213E-7,
-      2.0734771545742213E-7,
-      5.369715798802195E-8,
-      1.115876960010197E-8,
-      1.688044468997323E-9,
-      1.4862205005954414E-10
-    ]
-  },
-  "2.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.006726948795197914,
-      0.0034301597009830467,
-      0.0017529965092381943,
-      9.56633314079269E-4,
-      4.971201941140987E-4,
-      2.442131410045778E-4,
-      1.1423119025035183E-4,
-      5.2130093742871976E-5,
-      2.3536495907959807E-5,
-      1.0493189978930791E-5,
-      4.552794250464071E-6,
-      1.8764058999993808E-6,
-      7.147694950762863E-7,
-      2.4378289572531177E-7,
-      7.297516339729307E-8,
-      1.8268937975835278E-8,
-      3.611268898154598E-9,
-      5.094731031250549E-10,
-      3.392145662133341E-11,
-      6.40521317544599E-14
-    ]
-  },
-  "3.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.0031669472503512005,
-      0.00149419094233491,
-      7.050785526241844E-4,
-      3.6046454869914857E-4,
-      1.7669267275099908E-4,
-      8.284331076651241E-5,
-      3.75039509726038E-5,
-      1.6753708633415646E-5,
-      7.398598807695472E-6,
-      3.1837686011978557E-6,
-      1.3013569070090647E-6,
-      4.926407600513649E-7,
-      1.678037493230711E-7,
-      4.960626976768206E-8,
-      1.2322059717362584E-8,
-      2.4006880691196534E-9,
-      3.2692452204521613E-10,
-      2.2056840866582583E-11,
-      1.224103293327088E-13,
-      0.0
-    ]
-  },
-  "4.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.0019149845446635042,
-      8.445958972314669E-4,
-      3.7152918819322316E-4,
-      1.788865881924869E-4,
-      8.271525044278197E-5,
-      3.66620330113979E-5,
-      1.5725188046647633E-5,
-      6.642649466295296E-6,
-      2.748820019530117E-6,
-      1.0868210522806587E-6,
-      3.993912371247313E-7,
-      1.3224742401862168E-7,
-      3.822529093354728E-8,
-      9.1935656587605E-9,
-      1.7622182716655154E-9,
-      2.4345617534615273E-10,
-      1.860753389536622E-11,
-      2.8740355417980997E-13,
-      0.0,
-      0.0
-    ]
-  },
-  "5.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.0012134268244379904,
-      5.048977051398133E-4,
-      2.1060849899260653E-4,
-      9.748636867010856E-5,
-      4.3610965903091096E-5,
-      1.88344245225738E-5,
-      7.900835985488825E-6,
-      3.254390747342724E-6,
-      1.300568825219159E-6,
-      4.899557100481853E-7,
-      1.680188958192673E-7,
-      5.093263048498965E-8,
-      1.312608971673149E-8,
-      2.7111504771193635E-9,
-      4.2451296343458834E-10,
-      4.243052404013469E-11,
-      1.649125941712208E-12,
-      0.0,
-      0.0,
-      0.0
-    ]
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/data/e2e-wus-2008-LOS_ANGELES_CA.json b/src/test/resources/data/e2e-wus-2008-LOS_ANGELES_CA.json
deleted file mode 100644
index 38a35b101e68cf27c2b25432e8a1710d447ce579..0000000000000000000000000000000000000000
--- a/src/test/resources/data/e2e-wus-2008-LOS_ANGELES_CA.json
+++ /dev/null
@@ -1,140 +0,0 @@
-{
-  "Peak Ground Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.5657512264377693,
-      0.4605461117207852,
-      0.35284653321103676,
-      0.2685893240637453,
-      0.19675585127351075,
-      0.13889299139196012,
-      0.09396747339363413,
-      0.06030173567761195,
-      0.03619728755196671,
-      0.020282315981571115,
-      0.01070178139251942,
-      0.005318874612128815,
-      0.0024334915931485965,
-      9.74954192883067E-4,
-      3.191121493906901E-4,
-      7.5889820298867E-5,
-      1.1490551898097686E-5,
-      6.54934392753431E-7,
-      4.682351084041914E-9,
-      0.0
-    ]
-  },
-  "0.20 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.6550404553230742,
-      0.6007991791786479,
-      0.5218207285980762,
-      0.4395984130654445,
-      0.3521152022103098,
-      0.2684278883587444,
-      0.1957838808490816,
-      0.13782996149930293,
-      0.09344313800091612,
-      0.0602569654277733,
-      0.03655546429282782,
-      0.020913497733872903,
-      0.011407240343531714,
-      0.005924486414944311,
-      0.0028831082648205827,
-      0.0012559587622084226,
-      4.641397092225858E-4,
-      1.365080955604748E-4,
-      2.9258230876832592E-5,
-      3.7170144845545666E-6
-    ]
-  },
-  "1.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.48007160922873937,
-      0.3517903705195368,
-      0.2522606522212495,
-      0.18730108645470994,
-      0.13628298268321978,
-      0.09581932132264347,
-      0.06394732269549026,
-      0.03999386484124462,
-      0.02319079318881757,
-      0.01243037089076872,
-      0.006184249608560951,
-      0.002861349468819492,
-      0.0012112193650634176,
-      4.4721417020347716E-4,
-      1.35904364772142E-4,
-      3.114995988180234E-5,
-      4.409759356470916E-6,
-      2.2736403351884163E-7,
-      3.323420140426967E-9,
-      0.0
-    ]
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/data/e2e-wus-2008-RENO_NV.json b/src/test/resources/data/e2e-wus-2008-RENO_NV.json
deleted file mode 100644
index 1cfe9e051f55f69050cd0ffa525beaa418853d4a..0000000000000000000000000000000000000000
--- a/src/test/resources/data/e2e-wus-2008-RENO_NV.json
+++ /dev/null
@@ -1,140 +0,0 @@
-{
-  "Peak Ground Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.37325277607660945,
-      0.3003454448505239,
-      0.22638432814659948,
-      0.16884186715477983,
-      0.11985991325573649,
-      0.08091087142915238,
-      0.05196842092484945,
-      0.031854169319026855,
-      0.018525592434503822,
-      0.010132043344771817,
-      0.005108632911109156,
-      0.002261699024907398,
-      8.178397612113499E-4,
-      2.2414484323023858E-4,
-      4.380441110726087E-5,
-      5.5943495408827766E-6,
-      4.835681354154927E-7,
-      2.094700245770103E-8,
-      0.0,
-      0.0
-    ]
-  },
-  "0.20 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.4370129550511489,
-      0.39845276097752846,
-      0.34379990561226537,
-      0.28792868920297815,
-      0.2289061030545857,
-      0.17224242281566443,
-      0.1226831553666866,
-      0.08332575597766606,
-      0.054164135404740146,
-      0.03364321122248977,
-      0.01988679636903262,
-      0.0111576898301095,
-      0.005890064906340129,
-      0.002830184374028276,
-      0.001178089902083376,
-      3.9612381644510327E-4,
-      1.005233778522644E-4,
-      1.734912294017353E-5,
-      1.759777796760234E-6,
-      1.1427211235394819E-7
-    ]
-  },
-  "1.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.31005461337169443,
-      0.2217219214659663,
-      0.15255658254292678,
-      0.10727483622523877,
-      0.07267724071127188,
-      0.04715701211904724,
-      0.029188814693804053,
-      0.017241665127866842,
-      0.009654303274670463,
-      0.0050649364102812395,
-      0.0024369012835938134,
-      0.0010387756761900272,
-      3.764870691110119E-4,
-      1.1076342985473615E-4,
-      2.534016897167597E-5,
-      4.209626562247241E-6,
-      5.560768381758901E-7,
-      4.436536022496389E-8,
-      8.253030775073712E-10,
-      0.0
-    ]
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/data/e2e-wus-2008-SALT_LAKE_CITY_UT.json b/src/test/resources/data/e2e-wus-2008-SALT_LAKE_CITY_UT.json
deleted file mode 100644
index 4bea9de9be9c49438600ee682e195e0b4260a8c3..0000000000000000000000000000000000000000
--- a/src/test/resources/data/e2e-wus-2008-SALT_LAKE_CITY_UT.json
+++ /dev/null
@@ -1,140 +0,0 @@
-{
-  "Peak Ground Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.11837265127091329,
-      0.0926583008261633,
-      0.06795879114656785,
-      0.04971976710403012,
-      0.034831065852582624,
-      0.023357936242137247,
-      0.015049899252838058,
-      0.009467293722893502,
-      0.005917669022925067,
-      0.003744885273652381,
-      0.002428364943257588,
-      0.0015781300543258314,
-      9.530032026188236E-4,
-      4.814125747944071E-4,
-      1.8547202321698517E-4,
-      4.9744752848021984E-5,
-      8.142380602577994E-6,
-      5.883739671876302E-7,
-      1.7374972760207936E-9,
-      0.0
-    ]
-  },
-  "0.20 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.14220185319513506,
-      0.12793964803375565,
-      0.10828129693922012,
-      0.08889026820845668,
-      0.0692374991828098,
-      0.05120875118524367,
-      0.03608788254852777,
-      0.024455470181234163,
-      0.016035198811520747,
-      0.010251223977313907,
-      0.006481693521107984,
-      0.004134256203477661,
-      0.002695203844465108,
-      0.0017693252213722293,
-      0.00111060285236688,
-      6.127920408707943E-4,
-      2.7571838338877927E-4,
-      9.513272350657626E-5,
-      2.3270394598476272E-5,
-      3.4651858589035902E-6
-    ]
-  },
-  "1.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.09719362013162655,
-      0.06849705441422888,
-      0.04732437762447202,
-      0.03381445380402719,
-      0.023386753499684092,
-      0.015475435208571621,
-      0.009815287620777293,
-      0.006120818834824461,
-      0.003868871986742545,
-      0.0025206875977534095,
-      0.0016619088091336524,
-      0.0010542548857243811,
-      6.060031626440567E-4,
-      2.983341909606671E-4,
-      1.2041947903579435E-4,
-      3.760750517506697E-5,
-      8.47606776440813E-6,
-      1.1450737975411213E-6,
-      6.644286372104867E-8,
-      0.0
-    ]
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/data/e2e-wus-2008-SAN_FRANCISCO_CA.json b/src/test/resources/data/e2e-wus-2008-SAN_FRANCISCO_CA.json
deleted file mode 100644
index b9de30b880dd2c13f9e9b405e857d4c2ce3bedc6..0000000000000000000000000000000000000000
--- a/src/test/resources/data/e2e-wus-2008-SAN_FRANCISCO_CA.json
+++ /dev/null
@@ -1,140 +0,0 @@
-{
-  "Peak Ground Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.47101861181096283,
-      0.39371696545605944,
-      0.3091172386346556,
-      0.24009759018771787,
-      0.17964773049263152,
-      0.12986031521839875,
-      0.09040361146325965,
-      0.060500212085022716,
-      0.038702366619606146,
-      0.023227626874996705,
-      0.012573043457199805,
-      0.005823778029464391,
-      0.0021715746940155194,
-      6.044947786217873E-4,
-      1.1642383905522941E-4,
-      1.2476355423515894E-5,
-      3.7352967187332475E-7,
-      1.9953075273509616E-11,
-      0.0,
-      0.0
-    ]
-  },
-  "0.20 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.5292749731010379,
-      0.49303059793362564,
-      0.4372775778901968,
-      0.37615386073535806,
-      0.3079611106967016,
-      0.2399374488099459,
-      0.17900284232316188,
-      0.129297722217432,
-      0.09058207150207037,
-      0.06123509506498063,
-      0.03965639829057593,
-      0.024211613023899913,
-      0.013474209552229935,
-      0.006514645038562834,
-      0.002623283983544339,
-      8.325235311092001E-4,
-      1.9443295414086733E-4,
-      3.072243155151941E-5,
-      2.2601255744795244E-6,
-      1.6751039634941725E-8
-    ]
-  },
-  "1.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.40172983543791274,
-      0.3006661782671971,
-      0.2172810216072855,
-      0.16155293730940506,
-      0.11795143103039124,
-      0.08387573062281596,
-      0.05739558205937127,
-      0.0375062194953475,
-      0.02316407111227851,
-      0.013352034224252695,
-      0.007054271187681379,
-      0.0033123888972858054,
-      0.001319170486608717,
-      4.1967163486700525E-4,
-      1.0091571216100362E-4,
-      1.5258709632491106E-5,
-      9.572442346276585E-7,
-      5.974012689827149E-10,
-      0.0,
-      0.0
-    ]
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/data/e2e-wus-2008-SEATTLE_WA.json b/src/test/resources/data/e2e-wus-2008-SEATTLE_WA.json
deleted file mode 100644
index e66b9a50745d39fa44a905457f48741ca86d2ef4..0000000000000000000000000000000000000000
--- a/src/test/resources/data/e2e-wus-2008-SEATTLE_WA.json
+++ /dev/null
@@ -1,140 +0,0 @@
-{
-  "Peak Ground Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.26967148512718503,
-      0.23016297275550812,
-      0.18561887446006317,
-      0.14690194534861162,
-      0.11043519830921612,
-      0.07851533787854269,
-      0.052661709983288306,
-      0.03338911575054006,
-      0.01985352738161583,
-      0.010867354032551683,
-      0.005360042246508093,
-      0.0023426570962042474,
-      8.870706709234516E-4,
-      2.768055275727728E-4,
-      6.713162459884788E-5,
-      1.1400729146991169E-5,
-      1.3445846606599632E-6,
-      9.124844970015938E-8,
-      3.142976844270657E-9,
-      0.0
-    ]
-  },
-  "0.20 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.30014104111420353,
-      0.27975897122223853,
-      0.2502966715191469,
-      0.21832330939421304,
-      0.18175291853253872,
-      0.14343231460499592,
-      0.10689502508848518,
-      0.07544283825321796,
-      0.05042799293060384,
-      0.031802903560688905,
-      0.018776252579528183,
-      0.010249595255362353,
-      0.005089603645890727,
-      0.00226102563516169,
-      8.950674530064006E-4,
-      3.072207210200886E-4,
-      8.825675753351682E-5,
-      2.037814586231689E-5,
-      3.5051529778359706E-6,
-      3.6804258443562196E-7
-    ]
-  },
-  "1.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.22697700929852224,
-      0.17266234404503344,
-      0.12568028085353206,
-      0.09255482860284439,
-      0.06564320493136164,
-      0.04454219956516006,
-      0.028780958784558927,
-      0.017717757187616385,
-      0.010298436262305057,
-      0.005548843420599111,
-      0.002709596937745406,
-      0.0011742886048663119,
-      4.4208998796467893E-4,
-      1.4015628188197136E-4,
-      3.635894629114456E-5,
-      7.173687243175665E-6,
-      1.0605270916385506E-6,
-      1.0972510183964648E-7,
-      4.8080117328350464E-9,
-      1.303660437421487E-10
-    ]
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/data/e2e-wus-2014-LOS_ANGELES_CA.json b/src/test/resources/data/e2e-wus-2014-LOS_ANGELES_CA.json
deleted file mode 100644
index ab98558e0da97f0dc0dce227e270e02fff27888d..0000000000000000000000000000000000000000
--- a/src/test/resources/data/e2e-wus-2014-LOS_ANGELES_CA.json
+++ /dev/null
@@ -1,140 +0,0 @@
-{
-  "Peak Ground Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.7384736748094644,
-      0.5138710941193213,
-      0.35774214112648034,
-      0.2601437729476198,
-      0.18518683884673684,
-      0.12713142095679794,
-      0.08316518684213026,
-      0.051907878996315486,
-      0.030967978645825785,
-      0.017590428328046588,
-      0.009432436576959068,
-      0.004721540546883916,
-      0.0021437576860863766,
-      8.36132535497044E-4,
-      2.6566875494922585E-4,
-      6.339633177030402E-5,
-      1.0072806814351053E-5,
-      8.827338841513406E-7,
-      2.0751675096524002E-8,
-      7.578003965598886E-12
-    ]
-  },
-  "0.20 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      1.0214335497447191,
-      0.779547248210228,
-      0.5834195817248521,
-      0.447641079403226,
-      0.3366740330073565,
-      0.2470448432768864,
-      0.1758293803655708,
-      0.12092097101609038,
-      0.07973839021147458,
-      0.05015347321873675,
-      0.03007967187648588,
-      0.017225772518906834,
-      0.009397389719592808,
-      0.004832024049340744,
-      0.0022987676968976964,
-      9.64355419160642E-4,
-      3.4005661446983855E-4,
-      9.520733028693581E-5,
-      1.9256894700986773E-5,
-      2.3390474613263513E-6
-    ]
-  },
-  "1.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.6187589397401805,
-      0.39778920872354845,
-      0.25396656751571534,
-      0.17040690295009964,
-      0.11145205350534579,
-      0.07042754960363089,
-      0.04287820072722396,
-      0.02536417120703148,
-      0.014609133287558277,
-      0.008137287853910578,
-      0.0043265669501269645,
-      0.0021498905055978464,
-      9.644795922444326E-4,
-      3.7448728816486394E-4,
-      1.2156853687000716E-4,
-      3.080109524425852E-5,
-      5.378872314104409E-6,
-      5.220660578891652E-7,
-      1.2174860913648629E-8,
-      0.0
-    ]
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/data/e2e-wus-2014-RENO_NV.json b/src/test/resources/data/e2e-wus-2014-RENO_NV.json
deleted file mode 100644
index bb87c0e3f19d782ac71b2926536b8957730e566c..0000000000000000000000000000000000000000
--- a/src/test/resources/data/e2e-wus-2014-RENO_NV.json
+++ /dev/null
@@ -1,140 +0,0 @@
-{
-  "Peak Ground Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.5102602416019254,
-      0.35257132845745714,
-      0.24418924520016125,
-      0.1763918922658902,
-      0.12477398947540287,
-      0.0855555736744641,
-      0.05622919406756574,
-      0.035159653371936335,
-      0.020741334065151537,
-      0.011504744756120417,
-      0.0059682724011744966,
-      0.0028192511618191467,
-      0.0011509768677535575,
-      3.81676065951175E-4,
-      9.740339335236684E-5,
-      1.7215799111215463E-5,
-      1.8158853132413983E-6,
-      8.66121613589158E-8,
-      3.594469032305179E-10,
-      0.0
-    ]
-  },
-  "0.20 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.7237433891286746,
-      0.5370812897405478,
-      0.39739329408906865,
-      0.30348754882255013,
-      0.22742069753971741,
-      0.16629163317558054,
-      0.11816666352289773,
-      0.08149498242313151,
-      0.05412210108382799,
-      0.034257549629931563,
-      0.02053433004662697,
-      0.011650937700924973,
-      0.006225592153213961,
-      0.0030511514149743502,
-      0.0013221725348501207,
-      4.8031030907080455E-4,
-      1.3909156146648814E-4,
-      2.9796324736658635E-5,
-      4.1271800344030575E-6,
-      3.085036964281353E-7
-    ]
-  },
-  "1.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.4622663468470958,
-      0.2969151341500447,
-      0.18767842865353598,
-      0.12344601332483236,
-      0.07865275897471058,
-      0.04846375017133819,
-      0.028931571648975557,
-      0.016857860035312686,
-      0.009566499347294411,
-      0.005216056704141209,
-      0.0026598455167285598,
-      0.0012204479864049169,
-      4.8290381220687936E-4,
-      1.572870338790933E-4,
-      4.000787396606982E-5,
-      6.893604423684692E-6,
-      7.961226336265362E-7,
-      5.902557257721649E-8,
-      1.075400331608756E-9,
-      0.0
-    ]
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/data/e2e-wus-2014-SALT_LAKE_CITY_UT.json b/src/test/resources/data/e2e-wus-2014-SALT_LAKE_CITY_UT.json
deleted file mode 100644
index 388b2af46cd036266b933fe7ef8365ee7dc93270..0000000000000000000000000000000000000000
--- a/src/test/resources/data/e2e-wus-2014-SALT_LAKE_CITY_UT.json
+++ /dev/null
@@ -1,140 +0,0 @@
-{
-  "Peak Ground Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.11903881657726191,
-      0.07958617866376624,
-      0.053638681362181126,
-      0.038080191891237083,
-      0.02664497862753637,
-      0.018258707298613935,
-      0.012247746264886734,
-      0.008150398938663362,
-      0.005467652646316139,
-      0.003733566558190321,
-      0.0025700933349323326,
-      0.0017127942142598671,
-      0.0010279944255459758,
-      5.10395448323241E-4,
-      1.968517144414921E-4,
-      5.5374948835046274E-5,
-      1.0349505079540195E-5,
-      9.95330041775648E-7,
-      2.568792948054049E-8,
-      0.0
-    ]
-  },
-  "0.20 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.17433729238135898,
-      0.12661138618841475,
-      0.0912160634976666,
-      0.06806821923801548,
-      0.049941966343519426,
-      0.03589476234358742,
-      0.025236599754635686,
-      0.017425300847747374,
-      0.011847715218559329,
-      0.007995201185325203,
-      0.005431606996089952,
-      0.003751330560329052,
-      0.0026083068588292975,
-      0.0017570379205823097,
-      0.0010809513166910693,
-      5.654129125242948E-4,
-      2.3825048632355116E-4,
-      7.762411438199308E-5,
-      1.8140978422293332E-5,
-      2.55784613827375E-6
-    ]
-  },
-  "1.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.10596124820633068,
-      0.06792957175619965,
-      0.04381906776002565,
-      0.02977707703923209,
-      0.019829533767284004,
-      0.012936447765807279,
-      0.008366545556646867,
-      0.005497108426220418,
-      0.003714837271541792,
-      0.002551435223749081,
-      0.0017125681662582561,
-      0.0010628179072074359,
-      5.754748206192002E-4,
-      2.5850279594999024E-4,
-      9.330361618093672E-5,
-      2.5475230143054193E-5,
-      4.623281004655722E-6,
-      3.644394827245409E-7,
-      5.348998995297217E-9,
-      0.0
-    ]
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/data/e2e-wus-2014-SAN_FRANCISCO_CA.json b/src/test/resources/data/e2e-wus-2014-SAN_FRANCISCO_CA.json
deleted file mode 100644
index da2beec9f4a63ad0c80a32fb6a4e30374a8a7307..0000000000000000000000000000000000000000
--- a/src/test/resources/data/e2e-wus-2014-SAN_FRANCISCO_CA.json
+++ /dev/null
@@ -1,140 +0,0 @@
-{
-  "Peak Ground Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.6677789917719842,
-      0.45832100382614843,
-      0.3159958248609082,
-      0.2285907577268064,
-      0.16329828325380957,
-      0.11463415757335764,
-      0.07849924971706396,
-      0.05195758006105337,
-      0.03272600115273731,
-      0.019295664117832477,
-      0.010427209714535047,
-      0.004990218963913565,
-      0.0020091155207892153,
-      6.357156803131206E-4,
-      1.477104483016714E-4,
-      2.1496077591746852E-5,
-      1.2510386148258978E-6,
-      3.3687402064867456E-9,
-      2.0886162572940853E-14,
-      0.0
-    ]
-  },
-  "0.20 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.9409628502140214,
-      0.7072810820978195,
-      0.5228169547649767,
-      0.3975463988880504,
-      0.2967556195387333,
-      0.2169385210486046,
-      0.15536249010683817,
-      0.10940841723225439,
-      0.07535722703745319,
-      0.050140963163140206,
-      0.03178294379053802,
-      0.01892447756452922,
-      0.010377666557491933,
-      0.005076880464746951,
-      0.0021461637250515648,
-      7.446663414480461E-4,
-      2.0071337533689323E-4,
-      3.8502278228434464E-5,
-      3.964508558348773E-6,
-      1.0342156771273146E-7
-    ]
-  },
-  "1.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.5626907069164301,
-      0.358573762507184,
-      0.22957326797378738,
-      0.15608630922951766,
-      0.10487222571379752,
-      0.06918557350145192,
-      0.04450919210154381,
-      0.02783435590310697,
-      0.016778977791211187,
-      0.00961829352389245,
-      0.005125808759202482,
-      0.0024585600579535892,
-      0.001018629192710313,
-      3.462494465232287E-4,
-      9.181226450018553E-5,
-      1.6342012565837602E-5,
-      1.3197933272279655E-6,
-      6.260231772321492E-9,
-      5.6681023713062934E-12,
-      0.0
-    ]
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/data/e2e-wus-2014-SEATTLE_WA.json b/src/test/resources/data/e2e-wus-2014-SEATTLE_WA.json
deleted file mode 100644
index cec7002df62dffc1841c34134cf584f0dc806da8..0000000000000000000000000000000000000000
--- a/src/test/resources/data/e2e-wus-2014-SEATTLE_WA.json
+++ /dev/null
@@ -1,140 +0,0 @@
-{
-  "Peak Ground Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.271101708980927,
-      0.21636889108793034,
-      0.1678280666478889,
-      0.13076584073326927,
-      0.09788839273715058,
-      0.06979040413083908,
-      0.047156929574526184,
-      0.030279029784942298,
-      0.01840778415775804,
-      0.010469264190950836,
-      0.005474550077742251,
-      0.002580486879774179,
-      0.0010672561745645817,
-      3.7110264296795557E-4,
-      1.0357039353194725E-4,
-      2.0968221842968115E-5,
-      2.5900376153076868E-6,
-      1.659910732299111E-7,
-      1.736792461364465E-9,
-      0.0
-    ]
-  },
-  "0.20 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.32712418325873865,
-      0.2806683258614556,
-      0.23543058391500946,
-      0.1975384368281233,
-      0.16063182228868086,
-      0.12559891058848982,
-      0.09383564794819867,
-      0.06695276721320358,
-      0.045543531795609236,
-      0.029445841894867042,
-      0.018006557603516344,
-      0.01032497987068058,
-      0.005472456904523196,
-      0.002626598268499021,
-      0.0011241082877675396,
-      4.136918052530723E-4,
-      1.2577795049688447E-4,
-      2.979317242034001E-5,
-      4.854158066645369E-6,
-      5.008340929274181E-7
-    ]
-  },
-  "1.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.21189220578324397,
-      0.14868701189957548,
-      0.10195307733580668,
-      0.07191392574581391,
-      0.04909221125074541,
-      0.03224712510284602,
-      0.02033972557753044,
-      0.012363668544567946,
-      0.007193135342898989,
-      0.003939171330453578,
-      0.0019865700889905055,
-      9.021730438993164E-4,
-      3.6010469393705884E-4,
-      1.2251020919562097E-4,
-      3.4646638222273485E-5,
-      7.650516113971774E-6,
-      1.2025288914108152E-6,
-      1.1199918745454463E-7,
-      2.678201971725991E-9,
-      6.016894350217715E-13
-    ]
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/data/e2e-wus-2018-LOS_ANGELES_CA.json b/src/test/resources/data/e2e-wus-2018-LOS_ANGELES_CA.json
deleted file mode 100644
index 45ee3d35a3fa1f49a597a89e9842571b58897b02..0000000000000000000000000000000000000000
--- a/src/test/resources/data/e2e-wus-2018-LOS_ANGELES_CA.json
+++ /dev/null
@@ -1,554 +0,0 @@
-{
-  "Peak Ground Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.7542958319493401,
-      0.5209664388781939,
-      0.3607571710273966,
-      0.2614855853936393,
-      0.1857244115138562,
-      0.12732054742850882,
-      0.08322352073884073,
-      0.05192470792117303,
-      0.03097310341674558,
-      0.017592271641448883,
-      0.009433182480468835,
-      0.004721833539317558,
-      0.002143858317777728,
-      8.361604412048568E-4,
-      2.656745677768209E-4,
-      6.339710386955025E-5,
-      1.0072857186665215E-5,
-      8.827348284246377E-7,
-      2.0751671137300355E-8,
-      7.578003965598886E-12
-    ]
-  },
-  "0.10 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.9294369849172753,
-      0.6964000834536341,
-      0.5192935106947494,
-      0.4002866660678607,
-      0.30384709844741814,
-      0.22548002939663914,
-      0.16221427251373713,
-      0.11253236171598922,
-      0.07475810801913046,
-      0.04734734109472561,
-      0.02853982928504285,
-      0.01634327826360167,
-      0.008845920283534486,
-      0.004465407414634831,
-      0.0020614853681311697,
-      8.292431635546535E-4,
-      2.774006013024371E-4,
-      7.268110824954212E-5,
-      1.3299690249522428E-5,
-      1.3526321108032195E-6
-    ]
-  },
-  "0.20 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      1.0534821378574413,
-      0.7972855072250707,
-      0.5927201062239256,
-      0.4526642291504685,
-      0.33916657399021716,
-      0.24815469757232758,
-      0.17626545435768506,
-      0.12107295737273958,
-      0.07978622112226966,
-      0.05016796762623668,
-      0.030084435752461742,
-      0.017227614528630936,
-      0.009398171052769263,
-      0.00483234429241667,
-      0.002298885339881073,
-      9.643916216567894E-4,
-      3.400653793294152E-4,
-      9.520882297585073E-5,
-      1.9257036054165498E-5,
-      2.3390530811883493E-6
-    ]
-  },
-  "0.30 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      1.0837991863233032,
-      0.8090166220859274,
-      0.5879070860738953,
-      0.4380172053709164,
-      0.31883923983821255,
-      0.22578831049783207,
-      0.15475459413379042,
-      0.10239255659566744,
-      0.06500026214046908,
-      0.039450897703851566,
-      0.022904437186714772,
-      0.012729568921886321,
-      0.006745665029872234,
-      0.003355680450821038,
-      0.0015236251773263756,
-      5.993200601056391E-4,
-      1.9360272266003296E-4,
-      4.852284298170389E-5,
-      8.214294184114773E-6,
-      7.722791930016567E-7
-    ]
-  },
-  "0.40 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      1.058905250634575,
-      0.771879728638434,
-      0.5462254604824969,
-      0.3970757794499317,
-      0.2814676411903864,
-      0.19366668181303642,
-      0.12869952787902694,
-      0.08250707511916981,
-      0.05083638858666307,
-      0.03005686571481184,
-      0.017059532738368428,
-      0.009285050745815563,
-      0.00481335962456639,
-      0.0023205572853225997,
-      0.0010055805339840487,
-      3.707304984183945E-4,
-      1.1019813245170042E-4,
-      2.4557514542189145E-5,
-      3.416845362825325E-6,
-      2.3257739714906167E-7
-    ]
-  },
-  "0.50 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      1.0041415593808412,
-      0.7145652729459818,
-      0.49413341901897473,
-      0.35214337264298573,
-      0.24449650339499363,
-      0.16452408379222813,
-      0.10675584258044357,
-      0.06683022335422827,
-      0.040304831337247986,
-      0.023406301721826794,
-      0.013077988082705293,
-      0.007004082489342334,
-      0.0035533741458730257,
-      0.0016545550179495757,
-      6.825184377383122E-4,
-      2.3634786442578985E-4,
-      6.509151619374875E-5,
-      1.2934363118123435E-5,
-      1.4951709615886624E-6,
-      6.404456386853817E-8
-    ]
-  },
-  "0.75 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.8132373639597476,
-      0.5468272110697202,
-      0.36099385895449665,
-      0.248110586954661,
-      0.1661120977110046,
-      0.1075268586883623,
-      0.06699055298813485,
-      0.0403613621621144,
-      0.023572658562325863,
-      0.01332616111590553,
-      0.007246879650182006,
-      0.0037481544357261323,
-      0.0017988772798858,
-      7.691511899280016E-4,
-      2.834351982406703E-4,
-      8.519798693582089E-5,
-      1.937243730090029E-5,
-      2.8521567243824584E-6,
-      2.0721933726390405E-7,
-      1.788544111850201E-9
-    ]
-  },
-  "1.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.6366939358526552,
-      0.40701539683010185,
-      0.2585174065091374,
-      0.17271383648780014,
-      0.11250442371510402,
-      0.07084608548039834,
-      0.043019208256372427,
-      0.025404021630992556,
-      0.014618542586609377,
-      0.008139186725393597,
-      0.004326947010509607,
-      0.0021499889495664544,
-      9.645100531818457E-4,
-      3.744957431237506E-4,
-      1.2157040016994073E-4,
-      3.08013774503194E-5,
-      5.378895465944715E-6,
-      5.220668021827132E-7,
-      1.2174860913648629E-8,
-      0.0
-    ]
-  },
-  "2.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.2853819964842735,
-      0.1665105933627395,
-      0.09858172920956601,
-      0.062261953570387926,
-      0.03846836498830186,
-      0.023188180154849414,
-      0.013616335861414029,
-      0.007744837621600428,
-      0.004173972241904319,
-      0.002068585283594841,
-      9.13093260243524E-4,
-      3.474917086136375E-4,
-      1.1005020764620479E-4,
-      2.7281627797319232E-5,
-      4.837314144661407E-6,
-      4.980682171350873E-7,
-      1.559073816096128E-8,
-      0.0,
-      0.0,
-      0.0
-    ]
-  },
-  "3.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.15957735159915837,
-      0.08988546225381054,
-      0.05160518696182518,
-      0.03200149734715024,
-      0.019611016845554698,
-      0.011738828597588777,
-      0.006712508556292807,
-      0.003581925395120604,
-      0.0017306379375767618,
-      7.343747893708536E-4,
-      2.6554638755242507E-4,
-      7.953178624133404E-5,
-      1.8965511363043603E-5,
-      3.288011438468338E-6,
-      3.651634169303349E-7,
-      1.7113062506219615E-8,
-      2.289680085165135E-13,
-      0.0,
-      0.0,
-      0.0
-    ]
-  },
-  "4.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.10410575586609712,
-      0.05729939540876958,
-      0.032535706462897114,
-      0.020191985367845538,
-      0.012366177461128149,
-      0.007257056089759678,
-      0.00393721489626212,
-      0.0019223527111466331,
-      8.223764713096292E-4,
-      2.9998519784212155E-4,
-      9.068505447591303E-5,
-      2.2189659469229012E-5,
-      4.252642157329432E-6,
-      5.87529177614769E-7,
-      4.4222580824754065E-8,
-      2.661553066895866E-10,
-      0.0,
-      0.0,
-      0.0,
-      0.0
-    ]
-  },
-  "5.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.07307845316886563,
-      0.03985132064500434,
-      0.022723231593608093,
-      0.014164983881248686,
-      0.008597460503207402,
-      0.0048880870235589215,
-      0.002507976226646022,
-      0.0011351590750081472,
-      4.4341553220421506E-4,
-      1.4587653186061967E-4,
-      3.921598312858472E-5,
-      8.502869473848203E-6,
-      1.4613270843167006E-6,
-      1.6598486203075785E-7,
-      8.273625813121399E-9,
-      1.5827318580100672E-12,
-      0.0,
-      0.0,
-      0.0,
-      0.0
-    ]
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/data/e2e-wus-2018-RENO_NV.json b/src/test/resources/data/e2e-wus-2018-RENO_NV.json
deleted file mode 100644
index b7739d85a2bc6fae3d8512cea4a8b92f418ed870..0000000000000000000000000000000000000000
--- a/src/test/resources/data/e2e-wus-2018-RENO_NV.json
+++ /dev/null
@@ -1,554 +0,0 @@
-{
-  "Peak Ground Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.6293537979471416,
-      0.4386413450648639,
-      0.3054507831493246,
-      0.22067641015715264,
-      0.1552758599836528,
-      0.10529474589232916,
-      0.06811159051968659,
-      0.04181309722950502,
-      0.024195910987444048,
-      0.013160855980024604,
-      0.006698954615766693,
-      0.0031139156632423587,
-      0.0012570526841832019,
-      4.141275151847394E-4,
-      1.0536319286787648E-4,
-      1.8613230969033334E-5,
-      1.9540323917138507E-6,
-      9.133548002740317E-8,
-      3.594462898700902E-10,
-      0.0
-    ]
-  },
-  "0.10 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.7671699128401336,
-      0.5728961235113623,
-      0.43043157446458674,
-      0.33420497497843793,
-      0.25464405947286084,
-      0.18874459349505984,
-      0.1351472837969286,
-      0.09320466524070707,
-      0.06142396762778257,
-      0.038317232124257125,
-      0.02249632896131815,
-      0.012417555247675401,
-      0.006400225852808028,
-      0.0029977721890483643,
-      0.001230983333406822,
-      4.193147806479522E-4,
-      1.1144130175607934E-4,
-      2.0753932078371715E-5,
-      2.178651454295097E-6,
-      1.2098748705796105E-7
-    ]
-  },
-  "0.20 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.8862810645815787,
-      0.6624574003996512,
-      0.4939452122330509,
-      0.3793291895154342,
-      0.28515059734030246,
-      0.2083369803704516,
-      0.14716874525721788,
-      0.10038261811048921,
-      0.06567347663230964,
-      0.04085305073094934,
-      0.024037888340185398,
-      0.01338063659216029,
-      0.0070165790830877435,
-      0.0033822327851513916,
-      0.0014475585932975075,
-      5.216262140853531E-4,
-      1.5037572127397643E-4,
-      3.217343796063267E-5,
-      4.448961310838087E-6,
-      3.281605897320595E-7
-    ]
-  },
-  "0.30 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.9276138959715247,
-      0.6829121812577598,
-      0.4970193259618857,
-      0.3714443411551613,
-      0.27013397982655984,
-      0.18996344263681358,
-      0.1286880154492039,
-      0.08406467743585196,
-      0.05269057548409911,
-      0.03146860560135764,
-      0.017852686600899653,
-      0.009618580650659354,
-      0.0048635905504961375,
-      0.002224286170755592,
-      8.831364380697329E-4,
-      2.88197271363816E-4,
-      7.296618661419802E-5,
-      1.301670946561017E-5,
-      1.4313261666087027E-6,
-      8.740775685824729E-8
-    ]
-  },
-  "0.40 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.9139333722017986,
-      0.6586944849238415,
-      0.46704654678251273,
-      0.33987359443712445,
-      0.23962263001226192,
-      0.1626974599880098,
-      0.10613320607782067,
-      0.06675308850909634,
-      0.040373258281204916,
-      0.023372772642704442,
-      0.012923863083457492,
-      0.006792898581243444,
-      0.0033177708428258406,
-      0.0014373881437232479,
-      5.299396582274489E-4,
-      1.5691868575740846E-4,
-      3.474685100460329E-5,
-      5.078661331904452E-6,
-      4.625035944336172E-7,
-      2.3120940205149722E-8
-    ]
-  },
-  "0.50 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.8716857939201275,
-      0.6157057825546424,
-      0.42685597769450434,
-      0.3039861359203123,
-      0.20921902978856413,
-      0.1383505988436809,
-      0.0877646878848219,
-      0.05369039045847043,
-      0.031651403068914466,
-      0.017927312179027856,
-      0.009724007815850656,
-      0.004994293862756803,
-      0.0023542703517757907,
-      9.694699662793832E-4,
-      3.3546704604316406E-4,
-      9.170603652681976E-5,
-      1.806325870706426E-5,
-      2.288836475594181E-6,
-      1.9160289768687323E-7,
-      8.41687818964614E-9
-    ]
-  },
-  "0.75 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.7140549930420522,
-      0.4813371215331467,
-      0.31844367054135897,
-      0.21735579182216963,
-      0.1430376730904484,
-      0.09032786675845274,
-      0.05475804896875667,
-      0.03212083079014027,
-      0.01826093819706838,
-      0.010023164002160844,
-      0.005248294021749058,
-      0.002553161666523217,
-      0.0011070552881738062,
-      4.0781343125510604E-4,
-      1.2277494599159005E-4,
-      2.767695519825017E-5,
-      4.015944603844342E-6,
-      3.9067668308962714E-7,
-      2.1591057803471723E-8,
-      1.3410001989441545E-10
-    ]
-  },
-  "1.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.5640795721644839,
-      0.36272481662127376,
-      0.2294473200656034,
-      0.15087119615456196,
-      0.09588722027967986,
-      0.0587279286402676,
-      0.034701568092365,
-      0.019939405505828615,
-      0.01112870166734356,
-      0.005962281410396391,
-      0.002991756137572188,
-      0.0013554646769320829,
-      5.317280423998864E-4,
-      1.7230706765545894E-4,
-      4.377441237443924E-5,
-      7.58416666149167E-6,
-      8.669982594221179E-7,
-      6.183665567029536E-8,
-      1.0747225083380002E-9,
-      0.0
-    ]
-  },
-  "2.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.2641998991437185,
-      0.15251613396076147,
-      0.0876783654819045,
-      0.053783058737761485,
-      0.0322691462812868,
-      0.018816929489409443,
-      0.01058579119428974,
-      0.005696387409436946,
-      0.0028579722345134077,
-      0.0012885187693274782,
-      5.022624075754631E-4,
-      1.6328737792855837E-4,
-      4.194419980814897E-5,
-      7.540542290004301E-6,
-      9.135904270379213E-7,
-      6.893073236141172E-8,
-      9.676992424856662E-10,
-      0.0,
-      0.0,
-      0.0
-    ]
-  },
-  "3.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.1500329539113806,
-      0.08178889944932825,
-      0.04521850571043181,
-      0.027125565189326684,
-      0.015968204672656434,
-      0.009066644180896356,
-      0.0048493545257894885,
-      0.0023869293255494176,
-      0.0010451026517815552,
-      3.9221793660919156E-4,
-      1.2150638453839055E-4,
-      2.953181080649928E-5,
-      5.125667745178992E-6,
-      6.415473605269404E-7,
-      4.882502884176925E-8,
-      3.794617005276826E-10,
-      0.0,
-      0.0,
-      0.0,
-      0.0
-    ]
-  },
-  "4.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.09712480826760735,
-      0.051126602310821605,
-      0.02767977274765843,
-      0.016350098229002928,
-      0.009403656903005738,
-      0.005110311242807884,
-      0.002532435634092309,
-      0.0011118170336207656,
-      4.1812745109771535E-4,
-      1.2970561334948953E-4,
-      3.151801888988424E-5,
-      5.669585643817759E-6,
-      8.004939891317322E-7,
-      7.002577100065503E-8,
-      1.433633207239321E-9,
-      0.0,
-      0.0,
-      0.0,
-      0.0,
-      0.0
-    ]
-  },
-  "5.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.06677942492634739,
-      0.03442460598482771,
-      0.01835634561137175,
-      0.010659613378479541,
-      0.005956081586660678,
-      0.003086950052433995,
-      0.0014285231571921036,
-      5.74843372227489E-4,
-      1.948094722209577E-4,
-      5.31131939988754E-5,
-      1.0783057106445208E-5,
-      1.6432689932493958E-6,
-      1.8838371001476302E-7,
-      1.010933563165412E-8,
-      0.0,
-      0.0,
-      0.0,
-      0.0,
-      0.0,
-      0.0
-    ]
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/data/e2e-wus-2018-SALT_LAKE_CITY_UT.json b/src/test/resources/data/e2e-wus-2018-SALT_LAKE_CITY_UT.json
deleted file mode 100644
index d23f46df521d1dd5c460a8ae0e90b7d76b6a3bdb..0000000000000000000000000000000000000000
--- a/src/test/resources/data/e2e-wus-2018-SALT_LAKE_CITY_UT.json
+++ /dev/null
@@ -1,554 +0,0 @@
-{
-  "Peak Ground Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.10077473393190262,
-      0.06810670639202701,
-      0.046468702116233475,
-      0.033362448415236,
-      0.02361386374676526,
-      0.016369019056886647,
-      0.011110679346905608,
-      0.007491679763327045,
-      0.005105331376894283,
-      0.0035487498166983174,
-      0.0024853574513538637,
-      0.0016792334863661865,
-      0.0010170946985767744,
-      5.07700962846524E-4,
-      1.9639873747489585E-4,
-      5.534035499442247E-5,
-      1.0351330817740904E-5,
-      9.955160212226354E-7,
-      2.5687921221507314E-8,
-      0.0
-    ]
-  },
-  "0.10 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.12586143671588654,
-      0.09144771008341057,
-      0.06669594767933619,
-      0.05061874501189663,
-      0.03790215166841377,
-      0.027838751147379506,
-      0.01999857788975635,
-      0.014099088750770195,
-      0.009794207134413254,
-      0.006767376280079006,
-      0.0047106341686626975,
-      0.0033190251337684527,
-      0.002330438734139504,
-      0.0015626139155268612,
-      9.421317252738501E-4,
-      4.750330013206881E-4,
-      1.891203708542265E-4,
-      5.654257837456775E-5,
-      1.137291699376934E-5,
-      1.1377624667446988E-6
-    ]
-  },
-  "0.20 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.14628572354347102,
-      0.10695637061222577,
-      0.07767905625528904,
-      0.05845197408393052,
-      0.04330264084963777,
-      0.03145930974436387,
-      0.022371708187839682,
-      0.015626099841071765,
-      0.010751281519864802,
-      0.007352246186702616,
-      0.005073361143707566,
-      0.00356501770649232,
-      0.0025201910814564286,
-      0.0017205263701799188,
-      0.001068141907900128,
-      5.618326588789625E-4,
-      2.3752242777639254E-4,
-      7.75386226139463E-5,
-      1.8140585757608002E-5,
-      2.5584096644725942E-6
-    ]
-  },
-  "0.30 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.15202781644490926,
-      0.10963821127025473,
-      0.07808062625491359,
-      0.05758520504716398,
-      0.04170919479492535,
-      0.029573006034241532,
-      0.020505195986788873,
-      0.013976607183522883,
-      0.009419162209461455,
-      0.006353560473013017,
-      0.004358176633810871,
-      0.0030516739386513385,
-      0.0021282726236327228,
-      0.001398183823079082,
-      8.089864856395595E-4,
-      3.855223328128863E-4,
-      1.4461058476735315E-4,
-      4.0980984072984874E-5,
-      7.84973684505648E-6,
-      7.183479414253741E-7
-    ]
-  },
-  "0.40 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.148166331507591,
-      0.1045860193064773,
-      0.07295981646094592,
-      0.05286626481474005,
-      0.03758792602311576,
-      0.02612708123346509,
-      0.01774762587562554,
-      0.011877739536046929,
-      0.007913407118722404,
-      0.005329333391023954,
-      0.0036733664189181714,
-      0.002570040875417426,
-      0.0017538134783217718,
-      0.0010927921526576294,
-      5.8300678193018E-4,
-      2.5132395468337485E-4,
-      8.394932346843981E-5,
-      2.053543870888901E-5,
-      3.074147984859071E-6,
-      1.7314830773190787E-7
-    ]
-  },
-  "0.50 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.14034018697676162,
-      0.09726755818459913,
-      0.0668080197754512,
-      0.047807702809456246,
-      0.03355465213722363,
-      0.02300045415145318,
-      0.015405341091734217,
-      0.010198057411445926,
-      0.006767999973417813,
-      0.004574199168467665,
-      0.0031655665519204888,
-      0.0021962005575978925,
-      0.0014521666012020794,
-      8.547191282865619E-4,
-      4.233228221115245E-4,
-      1.6767606433435345E-4,
-      5.086994692506386E-5,
-      1.0884893259883936E-5,
-      1.219785694262716E-6,
-      4.9604763546699615E-8
-    ]
-  },
-  "0.75 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.11408216478400582,
-      0.07643085309899061,
-      0.05124149692851945,
-      0.03598906449388911,
-      0.02476844659602545,
-      0.016634104524098414,
-      0.010954312713737646,
-      0.0072112300295856385,
-      0.0048330293559930996,
-      0.0033218321308210908,
-      0.0023030147414327545,
-      0.001542416763240808,
-      9.413072985383789E-4,
-      4.931532033244387E-4,
-      2.1349169835875898E-4,
-      7.300597781842342E-5,
-      1.8636576556158325E-5,
-      3.0763845465565696E-6,
-      2.081674776704639E-7,
-      1.1321889300016738E-9
-    ]
-  },
-  "1.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.08984635769808136,
-      0.058487099813177866,
-      0.03836661498463163,
-      0.026474304404785796,
-      0.017914755666418022,
-      0.011882293289873695,
-      0.007815724790774236,
-      0.005221452586591876,
-      0.0035833661474931693,
-      0.002492843200639352,
-      0.0016889481581169347,
-      0.0010545691297981787,
-      5.731251431142268E-4,
-      2.5801528191309096E-4,
-      9.325082671615269E-5,
-      2.5479961917189654E-5,
-      4.624910062349921E-6,
-      3.6454322501629565E-7,
-      5.348888525909451E-9,
-      0.0
-    ]
-  },
-  "2.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.04564106972170993,
-      0.028634139041354315,
-      0.018032519745059806,
-      0.012032006770499915,
-      0.007982667641550678,
-      0.005331870622303349,
-      0.0036199205798354145,
-      0.0024752208742807318,
-      0.0016356669299092295,
-      9.88398868075477E-4,
-      5.181441393850733E-4,
-      2.2619216833752302E-4,
-      7.924628609180937E-5,
-      2.0915333517707686E-5,
-      3.712229660659092E-6,
-      2.9408505727841303E-7,
-      5.003854496999626E-9,
-      0.0,
-      0.0,
-      0.0
-    ]
-  },
-  "3.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.029420987967857,
-      0.01795467796822324,
-      0.011038646134784842,
-      0.007324536297818096,
-      0.004919502227535556,
-      0.003344000476041736,
-      0.0022505702968079935,
-      0.0014383606063832204,
-      8.271086693278227E-4,
-      4.068714675823041E-4,
-      1.6453751056328826E-4,
-      5.2674441432760284E-5,
-      1.2445529880792967E-5,
-      1.7822292635019124E-6,
-      1.2621185032135687E-7,
-      1.218847968522174E-9,
-      0.0,
-      0.0,
-      0.0,
-      0.0
-    ]
-  },
-  "4.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.02107083035144512,
-      0.012508837297772607,
-      0.007628800143919446,
-      0.005103314616897668,
-      0.0034525481127024695,
-      0.0023015812980096183,
-      0.0014425743967854932,
-      8.088184295745788E-4,
-      3.8659089793618534E-4,
-      1.509600347676158E-4,
-      4.609268856813344E-5,
-      1.0176857312483857E-5,
-      1.3074895976347803E-6,
-      8.808465791163193E-8,
-      4.243078330909962E-10,
-      0.0,
-      0.0,
-      0.0,
-      0.0,
-      0.0
-    ]
-  },
-  "5.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.015680081852536224,
-      0.009178461830794767,
-      0.005633648331916242,
-      0.0037965608990833625,
-      0.0025367409485344715,
-      0.0016067334062368095,
-      9.147998868157266E-4,
-      4.4912566904570337E-4,
-      1.8314360806349743E-4,
-      5.957468038819705E-5,
-      1.4494196741562166E-5,
-      2.2700240606340583E-6,
-      1.924587450379124E-7,
-      3.3461597412282723E-9,
-      0.0,
-      0.0,
-      0.0,
-      0.0,
-      0.0,
-      0.0
-    ]
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/data/e2e-wus-2018-SAN_FRANCISCO_CA.json b/src/test/resources/data/e2e-wus-2018-SAN_FRANCISCO_CA.json
deleted file mode 100644
index 5c1b1624b188f5c9bbca26ae0ecf8053dc5af106..0000000000000000000000000000000000000000
--- a/src/test/resources/data/e2e-wus-2018-SAN_FRANCISCO_CA.json
+++ /dev/null
@@ -1,554 +0,0 @@
-{
-  "Peak Ground Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.6802963132018389,
-      0.4631851019401089,
-      0.31773345013234644,
-      0.22922561662872568,
-      0.16348764081350167,
-      0.11466958514587372,
-      0.07849301487713492,
-      0.051945874582104284,
-      0.032717826395625926,
-      0.019291614472597928,
-      0.010425704426228245,
-      0.004989810385876343,
-      0.0020090894170944665,
-      6.357150550119659E-4,
-      1.477103795447526E-4,
-      2.149607277020081E-5,
-      1.251038411727861E-6,
-      3.3687464116629113E-9,
-      2.088566049876369E-14,
-      0.0
-    ]
-  },
-  "0.10 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.8454160926906448,
-      0.6248356392757367,
-      0.4614642750516798,
-      0.353110907029034,
-      0.26618037796283867,
-      0.1969457694673761,
-      0.14294977886606222,
-      0.10194043344951412,
-      0.0708605472738578,
-      0.04736017404500909,
-      0.030004783276511588,
-      0.01775391625544634,
-      0.009601765839763163,
-      0.004585635671134141,
-      0.0018681243374674727,
-      6.144138761242214E-4,
-      1.5303884268902932E-4,
-      2.5553631007547216E-5,
-      1.9160273249731366E-6,
-      1.1717131583122697E-8
-    ]
-  },
-  "0.20 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.9694889902996632,
-      0.7211340010667632,
-      0.5291636046582168,
-      0.4005404205355205,
-      0.29801703680492814,
-      0.217399140284108,
-      0.15550762634742624,
-      0.10945170276387275,
-      0.07537247694748643,
-      0.05014800025879215,
-      0.031786298928052605,
-      0.018925816410157677,
-      0.01037807842241015,
-      0.0050769515696193375,
-      0.002146167559912922,
-      7.446671977209052E-4,
-      2.0071353363037528E-4,
-      3.8502301641309524E-5,
-      3.9645108484687475E-6,
-      1.0342167341647148E-7
-    ]
-  },
-  "0.30 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      1.0051392038567797,
-      0.7356350642465384,
-      0.5264600322006471,
-      0.3884093717053848,
-      0.28110157751950665,
-      0.19924568779126192,
-      0.1383984870997233,
-      0.09451407365394598,
-      0.06304279960073503,
-      0.040524923597511746,
-      0.024743974463178095,
-      0.01414010806679615,
-      0.00739545946627845,
-      0.0034166841583015035,
-      0.0013481456426907693,
-      4.3052052521074386E-4,
-      1.0489104563675967E-4,
-      1.7305231174874458E-5,
-      1.3484827729249704E-6,
-      8.415819215731719E-9
-    ]
-  },
-  "0.40 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.9846788457756289,
-      0.7031733403033069,
-      0.4898872852454414,
-      0.35296072529443884,
-      0.24945238107734707,
-      0.17272666947229595,
-      0.11723435360253462,
-      0.07819043010392827,
-      0.050849304166683734,
-      0.03181636384362862,
-      0.018893305135635474,
-      0.010480727120756032,
-      0.005290346366646101,
-      0.002334146436915536,
-      8.672053330961894E-4,
-      2.559509943755024E-4,
-      5.591893898499025E-5,
-      7.538503183842573E-6,
-      3.947320562684411E-7,
-      6.707284103112761E-10
-    ]
-  },
-  "0.50 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.9334118231561339,
-      0.6507871190900014,
-      0.44357090270742194,
-      0.31403361279849096,
-      0.21823140622624018,
-      0.148650712813312,
-      0.09922644695502958,
-      0.06499655357640491,
-      0.041429047451285506,
-      0.02537439730003124,
-      0.01473858997226898,
-      0.00797598081511811,
-      0.0039035931837172883,
-      0.0016554258376719052,
-      5.852197329228182E-4,
-      1.6209400059279217E-4,
-      3.208319658652718E-5,
-      3.4979675043251413E-6,
-      1.1378601650771188E-7,
-      1.886121868532125E-10
-    ]
-  },
-  "0.75 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.7506980890969627,
-      0.49641891364903784,
-      0.3251934367945223,
-      0.2238623220006117,
-      0.1517064730981552,
-      0.10087151979965961,
-      0.06561641531012258,
-      0.04170254597197005,
-      0.02567086486470338,
-      0.015125889916101587,
-      0.008395032885932711,
-      0.004279297823477469,
-      0.0019317850914244894,
-      7.366427943703898E-4,
-      2.2754274943314747E-4,
-      5.2331542239937004E-5,
-      7.2260655376372915E-6,
-      3.64830075284087E-7,
-      4.4166754253822577E-10,
-      3.282912121805632E-13
-    ]
-  },
-  "1.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.5832314449918634,
-      0.3688670361265756,
-      0.23445129702733772,
-      0.15844483823397457,
-      0.10588792511882528,
-      0.06956343994450781,
-      0.044627123637657265,
-      0.02786510479026158,
-      0.016785632302362467,
-      0.009619446940172378,
-      0.005125911496802394,
-      0.0024585642339882844,
-      0.001018629957036245,
-      3.4624956955187894E-4,
-      9.181228261916606E-5,
-      1.6342014977562197E-5,
-      1.3197935598768257E-6,
-      6.260243263666654E-9,
-      5.6681697223876254E-12,
-      0.0
-    ]
-  },
-  "2.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.26192515754100226,
-      0.15489697906548,
-      0.09484693078948303,
-      0.06286034176293566,
-      0.04126096310717657,
-      0.026445160320550838,
-      0.016379710561573547,
-      0.009746969965911841,
-      0.005464916821186338,
-      0.002795294674441533,
-      0.0012523737815838814,
-      4.711595880408718E-4,
-      1.4196029793228662E-4,
-      3.10197369692768E-5,
-      3.852979291463456E-6,
-      1.5252594789896548E-7,
-      4.207360648561673E-12,
-      0.0,
-      0.0,
-      0.0
-    ]
-  },
-  "3.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.14917173570096692,
-      0.08722529250233899,
-      0.053396280453836605,
-      0.03531706447989696,
-      0.02302150583359976,
-      0.014582800844317744,
-      0.008854786895267181,
-      0.005077250481704297,
-      0.002667952556084264,
-      0.001235091990480535,
-      4.8362497220692737E-4,
-      1.5397669668280363E-4,
-      3.711493403404467E-5,
-      5.705614149304447E-6,
-      4.1968470867053123E-7,
-      4.413594516801314E-9,
-      0.0,
-      0.0,
-      0.0,
-      0.0
-    ]
-  },
-  "4.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.09984824690237501,
-      0.05857188245560826,
-      0.03590723965663268,
-      0.02368654919950719,
-      0.015374029457272743,
-      0.00967114481866296,
-      0.005776542656053975,
-      0.00320014164064954,
-      0.0015880085451929656,
-      6.793729142699848E-4,
-      2.4134895491119843E-4,
-      6.815977885940497E-5,
-      1.406594789430108E-5,
-      1.8640987627093374E-6,
-      1.187973052665281E-7,
-      1.3770227679578959E-14,
-      0.0,
-      0.0,
-      0.0,
-      0.0
-    ]
-  },
-  "5.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.07255116077722942,
-      0.04272299509506136,
-      0.02615094677484971,
-      0.01721997958706874,
-      0.011160701831485209,
-      0.006977783905454335,
-      0.004092976539490028,
-      0.0021921086909686685,
-      0.0010376837386580815,
-      4.196898155005586E-4,
-      1.399965908055993E-4,
-      3.6884058163489834E-5,
-      7.125427470009923E-6,
-      8.935007405351002E-7,
-      5.430224635867647E-8,
-      0.0,
-      0.0,
-      0.0,
-      0.0,
-      0.0
-    ]
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/data/e2e-wus-2018-SEATTLE_WA.json b/src/test/resources/data/e2e-wus-2018-SEATTLE_WA.json
deleted file mode 100644
index 4a1158ba8b1ec8f294df9d68385d09d2b67d0c9f..0000000000000000000000000000000000000000
--- a/src/test/resources/data/e2e-wus-2018-SEATTLE_WA.json
+++ /dev/null
@@ -1,554 +0,0 @@
-{
-  "Peak Ground Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.24202891986658567,
-      0.19403741603214633,
-      0.1512340729719724,
-      0.11831247821055357,
-      0.0889079548959214,
-      0.0636227458857756,
-      0.043148580901525714,
-      0.02781137018002017,
-      0.016973186257146375,
-      0.009686915541004756,
-      0.005078533918336527,
-      0.0023978258341095845,
-      9.929784889075512E-4,
-      3.457470240767525E-4,
-      9.66144764237362E-5,
-      1.9593885694552266E-5,
-      2.4416560443356E-6,
-      1.5966424145213395E-7,
-      1.6334618203748992E-9,
-      0.0
-    ]
-  },
-  "0.10 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.27512019812639965,
-      0.23656825307026988,
-      0.200104902159632,
-      0.16975731567340754,
-      0.1400028171958166,
-      0.11133118434715633,
-      0.08477956508694066,
-      0.06172237215352379,
-      0.042819196352329024,
-      0.02816812493444478,
-      0.017461719744983232,
-      0.010113743910493732,
-      0.0054014138955739595,
-      0.002607458390570569,
-      0.0011200811397831362,
-      4.126323680635228E-4,
-      1.2497242764123516E-4,
-      2.9064582604736605E-5,
-      4.41577451660019E-6,
-      3.5113504647470403E-7
-    ]
-  },
-  "0.20 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.29127759872592673,
-      0.2506565145207049,
-      0.21119421514580464,
-      0.17803231653773263,
-      0.14552763718391265,
-      0.11442328754980595,
-      0.08597765172845859,
-      0.06170082607142011,
-      0.04221804983735603,
-      0.027463632192117924,
-      0.01690252002637185,
-      0.00975451236919867,
-      0.005201558880219491,
-      0.0025102836673131777,
-      0.001079510159618087,
-      3.9899359701883513E-4,
-      1.2177561880168001E-4,
-      2.8929907535955654E-5,
-      4.722900869794457E-6,
-      4.883052099825145E-7
-    ]
-  },
-  "0.30 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.29277705103070084,
-      0.24719243249261905,
-      0.2027972396322417,
-      0.16619373389421457,
-      0.13140826598998492,
-      0.09947566323133016,
-      0.07172601374328161,
-      0.049375904829805306,
-      0.03247243091741441,
-      0.0203454882439767,
-      0.012047115375174375,
-      0.006649022238821227,
-      0.003358317414282155,
-      0.0015170680592670456,
-      6.031750466264242E-4,
-      2.0335818876212667E-4,
-      5.5746556533048126E-5,
-      1.168357789659328E-5,
-      1.7421245722259725E-6,
-      1.6100833735816914E-7
-    ]
-  },
-  "0.40 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.2858755181245989,
-      0.2352882193948453,
-      0.18730525850418073,
-      0.14912039261202276,
-      0.11423307683293325,
-      0.08362139306272393,
-      0.058307480939540954,
-      0.03891561923830017,
-      0.024890673642930624,
-      0.015175853612094664,
-      0.008708967959005498,
-      0.004621654880452076,
-      0.002223169096681751,
-      9.473896382601768E-4,
-      3.5244369236477855E-4,
-      1.1022554252613259E-4,
-      2.7750239563943183E-5,
-      5.326466954338624E-6,
-      7.319947109036247E-7,
-      5.3934219112749024E-8
-    ]
-  },
-  "0.50 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.2733774644480991,
-      0.21867218479616565,
-      0.16874329668448157,
-      0.13057842617635002,
-      0.09710539772519142,
-      0.06900258120236034,
-      0.04678670736616311,
-      0.030458840745670367,
-      0.019038520263658612,
-      0.01132410292546514,
-      0.006303279804751879,
-      0.0032182500821205224,
-      0.0014778664822846736,
-      5.975672787826241E-4,
-      2.1017066920536428E-4,
-      6.19721416078308E-5,
-      1.477616376445651E-5,
-      2.731542635901936E-6,
-      3.4620264453622244E-7,
-      2.134149922790981E-8
-    ]
-  },
-  "0.75 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.23105515159090237,
-      0.17248727220287877,
-      0.12458165964850079,
-      0.09131237211477704,
-      0.06450904118764451,
-      0.04373278372079524,
-      0.02842745749576691,
-      0.017805590467118056,
-      0.010698160411815278,
-      0.006076500295353907,
-      0.003196360584877849,
-      0.0015260551267654585,
-      6.491101080273757E-4,
-      2.4055021249411523E-4,
-      7.654006802777804E-5,
-      2.012472483500348E-5,
-      4.16190042497627E-6,
-      6.031296189457269E-7,
-      4.447825236747501E-8,
-      5.771018194227661E-10
-    ]
-  },
-  "1.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.19040843971067983,
-      0.13437975176678085,
-      0.09267113200550461,
-      0.06572632861842702,
-      0.04516921649694573,
-      0.029919527123186566,
-      0.01906300683445764,
-      0.011717040950006329,
-      0.00689225417328185,
-      0.0038108499150977843,
-      0.0019359701393438318,
-      8.833501328097997E-4,
-      3.5343112895318165E-4,
-      1.2027652116567336E-4,
-      3.3949128902135686E-5,
-      7.478744886089001E-6,
-      1.1716030485625586E-6,
-      1.0936075031360405E-7,
-      2.58565307402495E-9,
-      5.742077542204707E-13
-    ]
-  },
-  "2.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.09445317007233474,
-      0.05951137233208351,
-      0.03763458307373252,
-      0.02503569041924092,
-      0.016213017471963773,
-      0.010153737485831215,
-      0.006132860645453189,
-      0.0035718650725616334,
-      0.001971803076902804,
-      9.98372764124046E-4,
-      4.4566969245468457E-4,
-      1.6903632354806655E-4,
-      5.226790618821381E-5,
-      1.2065236245745198E-5,
-      1.833676980430212E-6,
-      1.3089444271330592E-7,
-      1.7836146383580802E-9,
-      2.1535206308833854E-13,
-      0.0,
-      0.0
-    ]
-  },
-  "3.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.05651975234110633,
-      0.0339640050497391,
-      0.02058749602044008,
-      0.013257618685696223,
-      0.008353949567228954,
-      0.005120568859865532,
-      0.0030315085404693577,
-      0.0017109060004660234,
-      8.879807310768694E-4,
-      4.042297739425382E-4,
-      1.540921910329123E-4,
-      4.683348942062806E-5,
-      1.0250814497261217E-5,
-      1.2624915648814257E-6,
-      4.927087167162889E-8,
-      2.7908622694438553E-10,
-      3.107630298458576E-14,
-      0.0,
-      0.0,
-      0.0
-    ]
-  },
-  "4.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.03824744496446151,
-      0.022152812079875607,
-      0.013037307184227138,
-      0.008257462161150749,
-      0.005161462004058868,
-      0.0031495817079642704,
-      0.0018384142878995148,
-      9.95882885135998E-4,
-      4.7795336560012513E-4,
-      1.9320695411030614E-4,
-      6.230275232225773E-5,
-      1.4819254638876259E-5,
-      2.0891197344122283E-6,
-      1.1322543293808028E-7,
-      3.999309699394745E-10,
-      1.3016030332373549E-12,
-      0.0,
-      0.0,
-      0.0,
-      0.0
-    ]
-  },
-  "5.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.403677882205863,
-      -4.892852258439873,
-      -4.482952553263842,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.270169119255751,
-      -2.864704011147587,
-      -2.460409178187613,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.43232256227804705,
-      -0.027371196796132015,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.02719536710084194,
-      0.015200136416444354,
-      0.008728622452840997,
-      0.0054559134142013275,
-      0.0033701933984725428,
-      0.002016248179977597,
-      0.0011365858393493713,
-      5.873949039638511E-4,
-      2.6824487933043285E-4,
-      1.035998597895322E-4,
-      3.2281343173551586E-5,
-      7.58821533147015E-6,
-      1.0610711870447586E-6,
-      3.631351330314983E-8,
-      2.335561532333382E-11,
-      1.917034214009206E-14,
-      0.0,
-      0.0,
-      0.0,
-      0.0
-    ]
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2018-BOSTON_MA.json b/src/test/resources/e2e/nshm-conus-2018-BOSTON_MA.json
index dab045429f2b34727ab034dc8fce97981ebcf175..ab9787e649e44f0bc23dceaaba0329c36a9b29c7 100644
--- a/src/test/resources/e2e/nshm-conus-2018-BOSTON_MA.json
+++ b/src/test/resources/e2e/nshm-conus-2018-BOSTON_MA.json
@@ -1,278 +1,48 @@
 {
-  "0.03 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.03914233780797499,
-      0.02989016167425646,
-      0.022414738249816803,
-      0.016507976575887835,
-      0.011748674058483559,
-      0.008144348576472008,
-      0.005438400827601606,
-      0.0034864767292066977,
-      0.002157342689739229,
-      0.0012890832364940773,
-      7.479963578356696E-4,
-      4.2251815971585906E-4,
-      2.3212125774719244E-4,
-      1.2319600921334252E-4,
-      6.234822115513256E-5,
-      2.945030137482387E-5,
-      1.2745428815351975E-5,
-      4.920671648247059E-6,
-      1.6253730272271207E-6,
-      4.3897051492969254E-7
-    ]
-  },
-  "0.10 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.058466287208179896,
-      0.04523341775461499,
-      0.03417597057561101,
-      0.025272097457480932,
-      0.01803765138212007,
-      0.012536022222926064,
-      0.008386992947299686,
-      0.005375575135698241,
-      0.0033114741245990377,
-      0.0019573166567094596,
-      0.001114231841262589,
-      6.120099636414432E-4,
-      3.2480242410211894E-4,
-      1.6634094947720935E-4,
-      8.172543701921253E-5,
-      3.796490233181994E-5,
-      1.646814003518987E-5,
-      6.51772046503957E-6,
-      2.2644627932483934E-6,
-      6.663781564514834E-7
-    ]
-  },
-  "0.50 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.037847844507502025,
-      0.02567690634943678,
-      0.01676477231992802,
-      0.01057976558863212,
-      0.006330549015602008,
-      0.0036498803381026547,
-      0.001997668823959452,
-      0.001032467376372275,
-      5.074062115716712E-4,
-      2.37521115307631E-4,
-      1.0713945026682757E-4,
-      4.6855450646319724E-5,
-      1.9851758612293887E-5,
-      8.032351809898373E-6,
-      3.0231518915851564E-6,
-      1.0201548329668746E-6,
-      2.9905133617664697E-7,
-      7.269183491001854E-8,
-      1.3476747050691167E-8,
-      1.7163315396718482E-9
-    ]
-  },
-  "0.01 Second Spectral Acceleration": {
-    "xs": [
-      -6.061887011404528,
-      -5.654992310486769,
-      -5.251433780649187,
-      -4.845968672541022,
-      -4.439655747510518,
-      -4.034190639402354,
-      -3.6306105459899607,
-      -3.223888366691745,
-      -2.8184232585835804,
-      -2.4123999590012524,
-      -2.0099154790312257,
-      -1.5994875815809322,
-      -1.1973282616072674,
-      -0.789658080940789,
-      -0.3856624808119846,
-      0.01980262729617973,
-      0.4252677354043441,
-      0.8329091229351039,
-      1.235471471385307,
-      1.6428726885203377
-    ],
-    "ys": [
-      0.03993841227217027,
-      0.029596617356231945,
-      0.021565702316131204,
-      0.01531394203717907,
-      0.010538275414803904,
-      0.007003929679548266,
-      0.004493762511593919,
-      0.0027712357437226502,
-      0.0016563867296361461,
-      9.610058692678628E-4,
-      5.457252093485164E-4,
-      2.98337153461094E-4,
-      1.6018726984512102E-4,
-      8.192392042372969E-5,
-      3.984870060998225E-5,
-      1.7855820539659115E-5,
-      7.17256583291046E-6,
-      2.4769038804014534E-6,
-      7.180085034701538E-7,
-      1.5968077017980738E-7
-    ]
-  },
-  "7.50 Second Spectral Acceleration": {
-    "xs": [
-      -7.602904462212756,
-      -7.196771574447054,
-      -6.794426593675134,
-      -6.383026750047155,
-      -5.979535976242708,
-      -5.575389259887802,
-      -5.169045030843898,
-      -4.764165917478549,
-      -4.358310108056566,
-      -3.952844999948401,
-      -3.547379891840237,
-      -3.1419147837320724,
-      -2.7364496756239083,
-      -2.3309845675157437,
-      -1.9241486572738007,
-      -1.5186835491656363,
-      -1.1147416705979933,
-      -0.709276562489829,
-      -0.30381145438166457,
-      0.10436001532424286
-    ],
-    "ys": [
-      0.0039199665489630196,
-      0.002649149078227514,
-      0.0017206197635287292,
-      0.0010440634779037084,
-      5.976452743309104E-4,
-      3.171633932505286E-4,
-      1.5491634128298503E-4,
-      7.004335140878154E-5,
-      2.9342884032691897E-5,
-      1.1559411521441675E-5,
-      4.333270761151019E-6,
-      1.569264584319706E-6,
-      5.521316204566823E-7,
-      1.8302867373558098E-7,
-      5.533079833213406E-8,
-      1.4666798232612092E-8,
-      3.2572331758927513E-9,
-      5.622061312117269E-10,
-      6.824583049417134E-11,
-      4.388036699884585E-12
-    ]
-  },
-  "0.05 Second Spectral Acceleration": {
+  "1.00 Second Spectral Acceleration": {
     "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
     ],
     "ys": [
-      0.046675606488895405,
-      0.03607066134828531,
-      0.02736964932277993,
-      0.02042619880128213,
-      0.014780981248096781,
-      0.010447354169273025,
-      0.007126056764967811,
-      0.004665296550987655,
-      0.002939789819244215,
-      0.0017806848020501314,
-      0.0010411628995626097,
-      5.889491591026346E-4,
-      3.226644159357472E-4,
-      1.7073199925009947E-4,
-      8.654429025671603E-5,
-      4.132828720704226E-5,
-      1.831735252128341E-5,
-      7.354381760974894E-6,
-      2.5725132051642086E-6,
-      7.542997622195249E-7
+      0.02078455097994013,
+      0.013752036153143975,
+      0.008853912425965714,
+      0.00550450273759354,
+      0.0032956032209899917,
+      0.0018514963923265222,
+      9.93143597796057E-4,
+      4.956595518220795E-4,
+      2.3401548992797762E-4,
+      1.0471944598011257E-4,
+      4.508421273772285E-5,
+      1.8896301560235418E-5,
+      7.725874681605789E-6,
+      3.0391435785521576E-6,
+      1.11705158113441E-6,
+      3.7451324017266463E-7,
+      1.0752962397804165E-7,
+      2.596070736658151E-8,
+      4.917918081492094E-9,
+      6.503383766857791E-10
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -299,118 +69,26 @@
       0.7929925155296614
     ],
     "ys": [
-      0.0038498347565120205,
-      0.002508009919606796,
-      0.001559899852827533,
-      9.157690814974519E-4,
-      5.002312895767906E-4,
-      2.547445040642949E-4,
-      1.194580788537864E-4,
-      5.2331959704405177E-5,
-      2.156347308445193E-5,
-      8.401435809805703E-6,
-      3.1474351872760277E-6,
-      1.1421463146502527E-6,
-      3.930455995731863E-7,
-      1.294631969514673E-7,
-      3.7175784900169275E-8,
-      9.320214406333003E-9,
-      1.876382487623761E-9,
-      2.843180508601313E-10,
-      2.6930321908185136E-11,
-      1.033591597992263E-12
-    ]
-  },
-  "Peak Ground Velocity": {
-    "xs": [
-      -1.439695137847006,
-      -1.0356374895067213,
-      -0.6311117896404926,
-      -0.22564668153232822,
-      0.17395330712343798,
-      0.5877866649021191,
-      0.9895411936137477,
-      1.3962446919730587,
-      1.801709800081223,
-      2.2071749081893874,
-      2.6100697927420065,
-      3.0204248861443626,
-      3.4242626545931514,
-      3.828641396489095,
-      4.23410650459726,
-      4.634728988229636,
-      5.043425116919247,
-      5.4510384535657,
-      5.855071922202427,
-      6.263398262591624
-    ],
-    "ys": [
-      0.025070620661269347,
-      0.01734289203959507,
-      0.01169546271370758,
-      0.007668582975933569,
-      0.00491102894397992,
-      0.0029894995253896503,
-      0.0017775708007900716,
-      0.0010057679491862004,
-      5.425792140007751E-4,
-      2.7706305303667545E-4,
-      1.3415391994167798E-4,
-      6.041781320291379E-5,
-      2.605276940138407E-5,
-      1.062482292083981E-5,
-      4.067143637411805E-6,
-      1.4563380812322368E-6,
-      4.5947389330854426E-7,
-      1.2520062734589536E-7,
-      2.8430671879404137E-8,
-      4.8808793521851725E-9
-    ]
-  },
-  "0.075 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.053558779349950326,
-      0.04163355152035621,
-      0.031683579450450534,
-      0.023651969817799573,
-      0.01708345688729975,
-      0.012034818471097865,
-      0.008173175891564247,
-      0.005322843945850345,
-      0.0033333551614215863,
-      0.0020039427017514463,
-      0.0011610707402965282,
-      6.49740228832071E-4,
-      3.5175567014812713E-4,
-      1.8397425673339883E-4,
-      9.239132241464239E-5,
-      4.389741055232046E-5,
-      1.947339735059552E-5,
-      7.882288436937665E-6,
-      2.8026538021315537E-6,
-      8.438866197483163E-7
+      0.0038496686700113577,
+      0.0025078664183317773,
+      0.0015597948853785957,
+      9.157017059864715E-4,
+      5.001931310456336E-4,
+      2.5472499185031885E-4,
+      1.194486623970574E-4,
+      5.232735935686702E-5,
+      2.156118337115127E-5,
+      8.400347720866899E-6,
+      3.14699581817278E-6,
+      1.142023685405199E-6,
+      3.9303700685767176E-7,
+      1.29477426563478E-7,
+      3.718668812692664E-8,
+      9.324871744942213E-9,
+      1.877882948712356E-9,
+      2.8466329320775244E-10,
+      2.69747315108036E-11,
+      1.0385526508492285E-12
     ]
   },
   "Peak Ground Acceleration": {
@@ -437,72 +115,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.03915434771147558,
-      0.028875023243624898,
-      0.020883665735936214,
-      0.014675236825061092,
-      0.009966568799918083,
-      0.006525459698203796,
-      0.004121976241620071,
-      0.002503344053915695,
-      0.0014752422558326327,
-      8.449328299236284E-4,
-      4.7415118882997295E-4,
-      2.5623392997021864E-4,
-      1.3610065105900684E-4,
-      6.889900480466749E-5,
-      3.3208700976362416E-5,
-      1.4756400551274348E-5,
-      5.880079101681966E-6,
-      2.0147203271706218E-6,
-      5.798093577971087E-7,
-      1.2826598279767695E-7
-    ]
-  },
-  "2.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.007212898253624169,
-      0.004676573300429593,
-      0.002920130799663904,
-      0.001731294461783224,
-      9.704446035645144E-4,
-      5.008402550065288E-4,
-      2.442489363995219E-4,
-      1.1019498177285702E-4,
-      4.732744738087531E-5,
-      1.9505110519212336E-5,
-      7.839375885942605E-6,
-      3.0809138289937545E-6,
-      1.1640471800423585E-6,
-      4.118123004124754E-7,
-      1.3155208253491514E-7,
-      3.705950411068419E-8,
-      8.50167164056051E-9,
-      1.524045047941097E-9,
-      1.812505385452416E-10,
-      7.648411305960565E-12
+      0.03915433626110455,
+      0.028874987776381138,
+      0.020883581441243287,
+      0.014675088491569477,
+      0.009966398305490462,
+      0.006525399875535825,
+      0.0041221943891111765,
+      0.0025039012846601928,
+      0.0014759816292745382,
+      8.455590549998981E-4,
+      4.744378692952327E-4,
+      2.561490867328105E-4,
+      1.3579297249796823E-4,
+      6.854218948534536E-5,
+      3.2918036847988655E-5,
+      1.4569587193494358E-5,
+      5.782794746110382E-6,
+      1.9737183250309444E-6,
+      5.657594675445635E-7,
+      1.2462940285422412E-7
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -529,532 +161,26 @@
       1.998773638612381
     ],
     "ys": [
-      0.0605480105751499,
-      0.04501098005930879,
-      0.032384307769067484,
-      0.02260605326254201,
-      0.01506018704867334,
-      0.009690648275790322,
-      0.005956734794995151,
-      0.003489593411823374,
-      0.0019622113010085342,
-      0.0010595366783556544,
-      5.526864005182588E-4,
-      2.7897039818942953E-4,
-      1.3610824925137406E-4,
-      6.384228903168711E-5,
-      2.8460582385833015E-5,
-      1.180497237993753E-5,
-      4.465955435642237E-6,
-      1.49253037549434E-6,
-      4.1994805876545705E-7,
-      9.48348980480982E-8
-    ]
-  },
-  "0.75 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.031248205278516645,
-      0.021022831627778526,
-      0.013730084998235838,
-      0.008668451644582083,
-      0.005290636995637011,
-      0.0030493943200448166,
-      0.0016873599755561934,
-      8.730876144431824E-4,
-      4.277934376714163E-4,
-      1.981234833801192E-4,
-      8.781426215410185E-5,
-      3.769023604397422E-5,
-      1.5773148556275923E-5,
-      6.389189832832348E-6,
-      2.443165818385571E-6,
-      8.604689008662215E-7,
-      2.618941207020184E-7,
-      6.76910689298808E-8,
-      1.3856737386089236E-8,
-      2.052964708601786E-9
-    ]
-  },
-  "4.00 Second Spectral Acceleration": {
-    "xs": [
-      -6.622576336748475,
-      -6.214608098422191,
-      -5.809142990314028,
-      -5.405902577227974,
-      -4.999695354057922,
-      -4.595219855134923,
-      -4.186459851129906,
-      -3.780994743021742,
-      -3.3784578946926658,
-      -2.972015746936675,
-      -2.566550638828511,
-      -2.162823150618887,
-      -1.7544636844843582,
-      -1.3509272172825992,
-      -0.9441759353636907,
-      -0.5395680926316447,
-      -0.13353139262452263,
-      0.2700271372130602,
-      0.6780335427498971,
-      1.0818051703517284
-    ],
-    "ys": [
-      0.004260239917355343,
-      0.002747437951462869,
-      0.0016962495940869068,
-      9.90861525127217E-4,
-      5.387521682262966E-4,
-      2.7298743357773695E-4,
-      1.2732741837075774E-4,
-      5.5595999677880344E-5,
-      2.2928573337775342E-5,
-      8.926692861743784E-6,
-      3.360343370756821E-6,
-      1.2326581867341103E-6,
-      4.2734404702160673E-7,
-      1.3965580070780226E-7,
-      4.028870467937881E-8,
-      1.0015447259625218E-8,
-      2.0079161744639314E-9,
-      3.0444345288909135E-10,
-      2.7821682344262712E-11,
-      8.243538052237883E-13
-    ]
-  },
-  "0.02 Second Spectral Acceleration": {
-    "xs": [
-      -5.867478567326991,
-      -5.463192009738271,
-      -5.056155809398065,
-      -4.651214124489498,
-      -4.247495741716276,
-      -3.83970234384852,
-      -3.4357888264317746,
-      -3.03032371832361,
-      -2.624168717121508,
-      -2.2164073967529934,
-      -1.8140050781753747,
-      -1.40649706843741,
-      -1.0023934309275668,
-      -0.5960204698292225,
-      -0.19116050546115904,
-      0.2151113796169455,
-      0.62057648772511,
-      1.0260415958332743,
-      1.430311246536665,
-      1.8357763546448294
-    ],
-    "ys": [
-      0.03933021625154743,
-      0.02979012206255586,
-      0.022131406110143834,
-      0.01611749698230364,
-      0.01143744526948362,
-      0.007828560982051909,
-      0.005189302072845991,
-      0.0033120971270995552,
-      0.002040723617418319,
-      0.0012160681600583492,
-      7.096573150942213E-4,
-      4.0065580985596666E-4,
-      2.210303286111401E-4,
-      1.1736332009508205E-4,
-      5.957627357863399E-5,
-      2.8259993410035885E-5,
-      1.2294767842861585E-5,
-      4.766272396653292E-6,
-      1.5984737797764024E-6,
-      4.4054513533421145E-7
-    ]
-  },
-  "1.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.02078426825037505,
-      0.013751616669231689,
-      0.008853513006465641,
-      0.005504271013688692,
-      0.003295582247045737,
-      0.0018516332308120738,
-      9.933435868323443E-4,
-      4.958503975357015E-4,
-      2.3416067895984526E-4,
-      1.0481396227848263E-4,
-      4.513950892503689E-5,
-      1.8926393389477387E-5,
-      7.741381415109316E-6,
-      3.046659864333437E-6,
-      1.1203779990567415E-6,
-      3.758177608687153E-7,
-      1.0794864626103805E-7,
-      2.6067570268093618E-8,
-      4.93800112833589E-9,
-      6.529588236913286E-10
-    ]
-  },
-  "1.50 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.011096718555314453,
-      0.007264815181464962,
-      0.004611051506591618,
-      0.002801458376635591,
-      0.0016210026114562661,
-      8.696054160910163E-4,
-      4.422597450087881E-4,
-      2.0849582899450464E-4,
-      9.33634892901417E-5,
-      4.002558235634495E-5,
-      1.6694477298811717E-5,
-      6.819463764946971E-6,
-      2.7061990018969576E-6,
-      1.0168656315688113E-6,
-      3.514306910534065E-7,
-      1.0895716705327064E-7,
-      2.8348722553260165E-8,
-      6.038692794806542E-9,
-      9.51465720593215E-10,
-      8.617222840999325E-11
-    ]
-  },
-  "0.25 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.05540530051404282,
-      0.04028523914672501,
-      0.028272887419661302,
-      0.019199643597049558,
-      0.012400027410952193,
-      0.007724688311466729,
-      0.0045923065651716916,
-      0.00260067920507145,
-      0.001414331801573528,
-      7.394250697758931E-4,
-      3.740328367372389E-4,
-      1.8327639211133183E-4,
-      8.681958098385632E-5,
-      3.947312765494866E-5,
-      1.6991964088657635E-5,
-      6.763822576725088E-6,
-      2.43436424287352E-6,
-      7.665837346406031E-7,
-      2.0057812073967583E-7,
-      4.121865176925155E-8
-    ]
-  },
-  "0.30 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.052128624019661444,
-      0.03716807458671485,
-      0.0255204603361861,
-      0.016926727411131277,
-      0.010657028876634448,
-      0.006468826367846689,
-      0.003742851637950904,
-      0.0020594428641666513,
-      0.0010867634191930175,
-      5.508832471536552E-4,
-      2.7017067887168166E-4,
-      1.2839871729187512E-4,
-      5.897188875313501E-5,
-      2.593042839984566E-5,
-      1.0740530029609316E-5,
-      4.078693045644525E-6,
-      1.3863984388063983E-6,
-      4.070666806509814E-7,
-      9.754746553977037E-8,
-      1.777728102735033E-8
-    ]
-  },
-  "3.00 Second Spectral Acceleration": {
-    "xs": [
-      -6.214608098422191,
-      -5.809142990314028,
-      -5.405902577227974,
-      -4.999695354057922,
-      -4.595219855134923,
-      -4.186459851129906,
-      -3.780994743021742,
-      -3.3784578946926658,
-      -2.972015746936675,
-      -2.566550638828511,
-      -2.162823150618887,
-      -1.7544636844843582,
-      -1.3509272172825992,
-      -0.9441759353636907,
-      -0.5395680926316447,
-      -0.13353139262452263,
-      0.2700271372130602,
-      0.6780335427498971,
-      1.0818051703517284,
-      1.4883995840570443
-    ],
-    "ys": [
-      0.004406397605961208,
-      0.0028143718947870123,
-      0.0017203522100898657,
-      9.890702014775671E-4,
-      5.338947325651886E-4,
-      2.668157393159858E-4,
-      1.2512122967306064E-4,
-      5.546153188278619E-5,
-      2.3195001119492334E-5,
-      9.383357417575572E-6,
-      3.712325007920172E-6,
-      1.4135343909406086E-6,
-      5.165619157886807E-7,
-      1.7297142775266766E-7,
-      5.1833773706324095E-8,
-      1.3192943745917677E-8,
-      2.7295154009539544E-9,
-      4.062775169561117E-10,
-      3.4950513643719577E-11,
-      5.838784321867675E-13
-    ]
-  },
-  "10.00 Second Spectral Acceleration": {
-    "xs": [
-      -8.00736806798383,
-      -7.602904462212756,
-      -7.196771574447054,
-      -6.794426593675134,
-      -6.383026750047155,
-      -5.979535976242708,
-      -5.575389259887802,
-      -5.169045030843898,
-      -4.764165917478549,
-      -4.358310108056566,
-      -3.952844999948401,
-      -3.547379891840237,
-      -3.1419147837320724,
-      -2.7364496756239083,
-      -2.3309845675157437,
-      -1.9241486572738007,
-      -1.5186835491656363,
-      -1.1147416705979933,
-      -0.709276562489829,
-      -0.30381145438166457
-    ],
-    "ys": [
-      0.003571835864459561,
-      0.0024343291464347283,
-      0.0015832974158629912,
-      9.762618967828152E-4,
-      5.554432293287926E-4,
-      2.961437003938919E-4,
-      1.4560489268512926E-4,
-      6.567526760163609E-5,
-      2.7491158549826444E-5,
-      1.0738921154638049E-5,
-      3.9708272315327206E-6,
-      1.4134821212769344E-6,
-      4.871916396858531E-7,
-      1.5781241823626374E-7,
-      4.702756069022724E-8,
-      1.2189830132733457E-8,
-      2.649251624834432E-9,
-      4.556873867553408E-10,
-      5.5781162746423104E-11,
-      4.055262178307712E-12
-    ]
-  },
-  "0.40 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.044504228943102936,
-      0.03082070108757687,
-      0.020524478134379135,
-      0.013196618102656927,
-      0.008046881272976791,
-      0.004731177531052012,
-      0.00264688029982518,
-      0.0014036955730254562,
-      7.111912876558856E-4,
-      3.4476003042155357E-4,
-      1.6137541367051964E-4,
-      7.32033260991153E-5,
-      3.2104590473200855E-5,
-      1.3450114145075575E-5,
-      5.269102605756242E-6,
-      1.8690329093063012E-6,
-      5.83570896134091E-7,
-      1.5392132419119855E-7,
-      3.19082863406106E-8,
-      4.729379898609713E-9
-    ]
-  },
-  "0.15 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.06499906653577099,
-      0.049616144329237014,
-      0.036811025865104575,
-      0.0266161885137005,
-      0.018480029600417114,
-      0.012443285297652762,
-      0.0080320756326934,
-      0.004950891109171309,
-      0.002928704457726496,
-      0.0016617116711237809,
-      9.089413703526835E-4,
-      4.804558986988108E-4,
-      2.4568997610767564E-4,
-      1.2125692684576274E-4,
-      5.732933946972455E-5,
-      2.553772431767668E-5,
-      1.0559769991023885E-5,
-      3.947563804087821E-6,
-      1.2791168914692539E-6,
-      3.455515762465405E-7
+      0.06054799387340501,
+      0.04501093716568888,
+      0.032384225534707246,
+      0.02260594710116112,
+      0.015060131175111444,
+      0.009690757366506483,
+      0.0059570791993269956,
+      0.00349010751115822,
+      0.001962702434309726,
+      0.0010598138716072616,
+      5.526846406248316E-4,
+      2.787643997578851E-4,
+      1.3582948573407562E-4,
+      6.359388081275608E-5,
+      2.8287825293638217E-5,
+      1.170707349148745E-5,
+      4.419923256430149E-6,
+      1.4745471754128641E-6,
+      4.1424535992947296E-7,
+      9.342364439170648E-8
     ]
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2018-CHICAGO_IL.json b/src/test/resources/e2e/nshm-conus-2018-CHICAGO_IL.json
index 7ee83da7c3f521ca515441d9092c45b3fa7232b7..c1efe70bd57cfa950f3500f75259a4db4f597bda 100644
--- a/src/test/resources/e2e/nshm-conus-2018-CHICAGO_IL.json
+++ b/src/test/resources/e2e/nshm-conus-2018-CHICAGO_IL.json
@@ -1,278 +1,48 @@
 {
-  "0.03 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.021415199952957688,
-      0.015176326514125114,
-      0.010704283412114208,
-      0.0074929560248859954,
-      0.005067337697240312,
-      0.003309723604842936,
-      0.002050733260206742,
-      0.0012048147203883185,
-      6.834397728504638E-4,
-      3.8007720304557014E-4,
-      2.1094605883799757E-4,
-      1.1722499989424255E-4,
-      6.462484191174229E-5,
-      3.474136878113784E-5,
-      1.7822938985339467E-5,
-      8.503035640990804E-6,
-      3.69662905726623E-6,
-      1.4255962044983592E-6,
-      4.678102259982354E-7,
-      1.2473901144081122E-7
-    ]
-  },
-  "0.10 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.03687780119961635,
-      0.026132787912055467,
-      0.01823880943763749,
-      0.012640553070929178,
-      0.008564874200136706,
-      0.005695189818651442,
-      0.003627889639168003,
-      0.002181302386526003,
-      0.001239752305895583,
-      6.695165252024555E-4,
-      3.499154651113233E-4,
-      1.798722149824764E-4,
-      9.174253103171466E-5,
-      4.622446890416979E-5,
-      2.2675422026723263E-5,
-      1.0578595234028908E-5,
-      4.604456131386467E-6,
-      1.8203461455134959E-6,
-      6.276922716837099E-7,
-      1.8189300392955268E-7
-    ]
-  },
-  "0.50 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.029132214994602088,
-      0.0189806047247321,
-      0.012213364382343281,
-      0.007881464954600315,
-      0.005032706304101386,
-      0.0031876678608212467,
-      0.0019246537156122846,
-      0.0010644756130796346,
-      5.221538550780107E-4,
-      2.195986350311877E-4,
-      7.84465891095197E-5,
-      2.426240466809278E-5,
-      7.030738247369897E-6,
-      2.1840694574951797E-6,
-      7.434413276081978E-7,
-      2.414753356722181E-7,
-      6.843510543731292E-8,
-      1.59348087378042E-8,
-      2.7791018108527906E-9,
-      3.2523546957794494E-10
-    ]
-  },
-  "0.01 Second Spectral Acceleration": {
-    "xs": [
-      -6.061887011404528,
-      -5.654992310486769,
-      -5.251433780649187,
-      -4.845968672541022,
-      -4.439655747510518,
-      -4.034190639402354,
-      -3.6306105459899607,
-      -3.223888366691745,
-      -2.8184232585835804,
-      -2.4123999590012524,
-      -2.0099154790312257,
-      -1.5994875815809322,
-      -1.1973282616072674,
-      -0.789658080940789,
-      -0.3856624808119846,
-      0.01980262729617973,
-      0.4252677354043441,
-      0.8329091229351039,
-      1.235471471385307,
-      1.6428726885203377
-    ],
-    "ys": [
-      0.0232009803276374,
-      0.01588144227753551,
-      0.010917718546370431,
-      0.007478450412491857,
-      0.005032480500243402,
-      0.003258848486008023,
-      0.0019936769951488945,
-      0.001135641147887529,
-      6.114178596084717E-4,
-      3.1762826862757437E-4,
-      1.649913839929484E-4,
-      8.56996227753098E-5,
-      4.536103656555414E-5,
-      2.3318546177766215E-5,
-      1.1450293768056903E-5,
-      5.160658510794714E-6,
-      2.0735719236823014E-6,
-      7.122076219636837E-7,
-      2.0419442584731344E-7,
-      4.4574923151468436E-8
-    ]
-  },
-  "7.50 Second Spectral Acceleration": {
-    "xs": [
-      -7.602904462212756,
-      -7.196771574447054,
-      -6.794426593675134,
-      -6.383026750047155,
-      -5.979535976242708,
-      -5.575389259887802,
-      -5.169045030843898,
-      -4.764165917478549,
-      -4.358310108056566,
-      -3.952844999948401,
-      -3.547379891840237,
-      -3.1419147837320724,
-      -2.7364496756239083,
-      -2.3309845675157437,
-      -1.9241486572738007,
-      -1.5186835491656363,
-      -1.1147416705979933,
-      -0.709276562489829,
-      -0.30381145438166457,
-      0.10436001532424286
-    ],
-    "ys": [
-      0.005087721730639766,
-      0.003976471126081937,
-      0.0031554963142401958,
-      0.0024719914720103303,
-      0.0018728816569337499,
-      0.0013222654673358397,
-      8.403273528400035E-4,
-      4.6666641797421125E-4,
-      2.1938466916739208E-4,
-      8.576523205139916E-5,
-      2.7248486120432883E-5,
-      6.787322527415182E-6,
-      1.2854595664159615E-6,
-      1.7897146208028692E-7,
-      1.616940836289771E-8,
-      2.4630931936584006E-9,
-      5.74251934264313E-10,
-      1.0942558114506564E-10,
-      1.5504708726859704E-11,
-      1.3088068428865763E-12
-    ]
-  },
-  "0.05 Second Spectral Acceleration": {
+  "1.00 Second Spectral Acceleration": {
     "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
     ],
     "ys": [
-      0.02675746804552609,
-      0.01903367736791901,
-      0.013442310985722482,
-      0.009445665812097237,
-      0.006457299531757921,
-      0.004298471562203473,
-      0.0027323202096355384,
-      0.0016487618965576518,
-      9.548489572798034E-4,
-      5.363351332234928E-4,
-      2.969312311353152E-4,
-      1.632545363533844E-4,
-      8.888347627341918E-5,
-      4.736145401311616E-5,
-      2.4302055101660484E-5,
-      1.1736732952975124E-5,
-      5.238818481901508E-6,
-      2.106020490103739E-6,
-      7.329597445821978E-7,
-      2.12323904135114E-7
+      0.017675500237871122,
+      0.011804993270225163,
+      0.007916670756587606,
+      0.005349147248044569,
+      0.003631390427708422,
+      0.0023844055384784845,
+      0.0014870231028831253,
+      8.355484214788527E-4,
+      4.1460657776932694E-4,
+      1.7579111278565789E-4,
+      6.240935342700551E-5,
+      1.824083214413613E-5,
+      4.414927964063777E-6,
+      9.994457044956118E-7,
+      2.485513364750664E-7,
+      7.726459746150789E-8,
+      2.121042318488014E-8,
+      4.860565864414978E-9,
+      8.641052442615079E-10,
+      1.0633132855584106E-10
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -299,118 +69,26 @@
       0.7929925155296614
     ],
     "ys": [
-      0.004904729525218748,
-      0.0037557772231247245,
-      0.002900800978171847,
-      0.002197334586881119,
-      0.0015715480184104107,
-      0.0010318179509125533,
-      5.988341070335751E-4,
-      3.00002130229277E-4,
-      1.2636791653138806E-4,
-      4.334524151406029E-5,
-      1.1729721718860492E-5,
-      2.38400627612158E-6,
-      3.523796033489146E-7,
-      3.79493586616785E-8,
-      5.991249745033427E-9,
-      1.4980539406239078E-9,
-      3.156166184078564E-10,
-      5.273948291002487E-11,
-      5.995435615232835E-12,
-      3.1638447771189843E-13
-    ]
-  },
-  "Peak Ground Velocity": {
-    "xs": [
-      -1.439695137847006,
-      -1.0356374895067213,
-      -0.6311117896404926,
-      -0.22564668153232822,
-      0.17395330712343798,
-      0.5877866649021191,
-      0.9895411936137477,
-      1.3962446919730587,
-      1.801709800081223,
-      2.2071749081893874,
-      2.6100697927420065,
-      3.0204248861443626,
-      3.4242626545931514,
-      3.828641396489095,
-      4.23410650459726,
-      4.634728988229636,
-      5.043425116919247,
-      5.4510384535657,
-      5.855071922202427,
-      6.263398262591624
-    ],
-    "ys": [
-      0.018639908576511335,
-      0.012853019374237013,
-      0.008928402044389406,
-      0.00628893786046141,
-      0.004513469776840019,
-      0.00319957590553628,
-      0.002244917871070637,
-      0.0015188163930541728,
-      9.86320218050021E-4,
-      6.021395182138048E-4,
-      3.3809160559878916E-4,
-      1.6605034269841167E-4,
-      6.974765597363855E-5,
-      2.3550935210027346E-5,
-      6.1014062874320946E-6,
-      1.1911818193529437E-6,
-      1.6372875622008456E-7,
-      2.4608204456858437E-8,
-      4.969808254548686E-9,
-      8.184891581168186E-10
-    ]
-  },
-  "0.075 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.032118922510355585,
-      0.022927823828395668,
-      0.016176153813527865,
-      0.011342437938049689,
-      0.007756343988304125,
-      0.005179280241576754,
-      0.0033002525478875036,
-      0.001986862777009392,
-      0.0011404300984357565,
-      6.306519969327575E-4,
-      3.4173547872235686E-4,
-      1.8333652974659957E-4,
-      9.743378290999634E-5,
-      5.087197111871041E-5,
-      2.5745973639036435E-5,
-      1.2354878881855899E-5,
-      5.521405709549125E-6,
-      2.2393324463064075E-6,
-      7.926764957246903E-7,
-      2.3592192766555033E-7
+      0.004904504983066268,
+      0.0037556118245414046,
+      0.0029006854981177585,
+      0.0021972569063650736,
+      0.0015714972511203782,
+      0.0010317853455482514,
+      5.988137176440333E-4,
+      2.9998980927107937E-4,
+      1.263608775768721E-4,
+      4.334153727062958E-5,
+      1.1727951025836868E-5,
+      2.383247006424206E-6,
+      3.520926494203768E-7,
+      3.785179659277222E-8,
+      5.963076928168123E-9,
+      1.4910332126633127E-9,
+      3.14178873723765E-10,
+      5.251118966478055E-11,
+      5.968234937924544E-12,
+      3.1469632224157163E-13
     ]
   },
   "Peak Ground Acceleration": {
@@ -437,72 +115,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.022709153088803474,
-      0.015516407525088264,
-      0.010635671771481597,
-      0.007251037242502168,
-      0.0048475724577795535,
-      0.0031115835516757934,
-      0.0018785044988261855,
-      0.0010503149080535947,
-      5.537634311623952E-4,
-      2.820044974240437E-4,
-      1.441137875987523E-4,
-      7.386133639813975E-5,
-      3.866055852727225E-5,
-      1.9679587527735172E-5,
-      9.58230635347683E-6,
-      4.287565242021686E-6,
-      1.7123875717198338E-6,
-      5.856787794935905E-7,
-      1.6773839930842043E-7,
-      3.682285864888503E-8
-    ]
-  },
-  "2.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.007394880938066951,
-      0.005275837202374249,
-      0.0038168187407487068,
-      0.00274171406083238,
-      0.0018987074568688998,
-      0.0012095558769653978,
-      6.990383418697162E-4,
-      3.470710730073888E-4,
-      1.4557708032577682E-4,
-      5.0022797667739386E-5,
-      1.3555539085976164E-5,
-      2.821986328649067E-6,
-      4.781115537039027E-7,
-      8.213559040260663E-8,
-      2.2993182038188E-8,
-      6.190489778358205E-9,
-      1.3648600241068056E-9,
-      2.389670821612729E-10,
-      2.8765652192175936E-11,
-      1.5303610727983937E-12
+      0.022709150996398572,
+      0.01551640012938908,
+      0.01063565058866354,
+      0.007250987342509734,
+      0.004847475264828743,
+      0.003111424318650424,
+      0.0018782779132334624,
+      0.001050022497993213,
+      5.534113089259502E-4,
+      2.81605357092695E-4,
+      1.4369489671881903E-4,
+      7.346403339083293E-5,
+      3.8325297999058965E-5,
+      1.9431569974270378E-5,
+      9.421592539610684E-6,
+      4.1976884388553816E-6,
+      1.6696279770654772E-6,
+      5.688244700978395E-7,
+      1.6230550529800467E-7,
+      3.5499549032952975E-8
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -529,532 +161,26 @@
       1.998773638612381
     ],
     "ys": [
-      0.041847727706109686,
-      0.028519823227120742,
-      0.019028651014821357,
-      0.012597754257260963,
-      0.008183597609730937,
-      0.005256497908587534,
-      0.003238123657453767,
-      0.0018638412624199093,
-      9.910791862566327E-4,
-      4.834111575168988E-4,
-      2.1974719468613685E-4,
-      9.585152526752285E-5,
-      4.150562504160168E-5,
-      1.8097564382467088E-5,
-      7.793929556366117E-6,
-      3.181437030652351E-6,
-      1.1872974463454096E-6,
-      3.899385858868817E-7,
-      1.0694405396942193E-7,
-      2.3231393429498228E-8
-    ]
-  },
-  "0.75 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.02561482011123825,
-      0.016913257766941418,
-      0.011121777104900471,
-      0.007332550654566124,
-      0.0048757479553200814,
-      0.003181046665831512,
-      0.0020113491843459573,
-      0.0011685393683983061,
-      6.093964903613104E-4,
-      2.7496980698383063E-4,
-      1.047471141889804E-4,
-      3.3121076012781854E-5,
-      8.849075091282894E-6,
-      2.1757338615202016E-6,
-      5.909715196238892E-7,
-      1.9302475714946263E-7,
-      5.6354627414873383E-8,
-      1.395552449104546E-8,
-      2.6931309575154653E-9,
-      3.6979401599248286E-10
-    ]
-  },
-  "4.00 Second Spectral Acceleration": {
-    "xs": [
-      -6.622576336748475,
-      -6.214608098422191,
-      -5.809142990314028,
-      -5.405902577227974,
-      -4.999695354057922,
-      -4.595219855134923,
-      -4.186459851129906,
-      -3.780994743021742,
-      -3.3784578946926658,
-      -2.972015746936675,
-      -2.566550638828511,
-      -2.162823150618887,
-      -1.7544636844843582,
-      -1.3509272172825992,
-      -0.9441759353636907,
-      -0.5395680926316447,
-      -0.13353139262452263,
-      0.2700271372130602,
-      0.6780335427498971,
-      1.0818051703517284
-    ],
-    "ys": [
-      0.005192919109660897,
-      0.003905438889586007,
-      0.0029678905440560575,
-      0.0022116565579066243,
-      0.0015534027564356714,
-      0.0010018820139539894,
-      5.720739960513276E-4,
-      2.821959607360689E-4,
-      1.1671661683934548E-4,
-      3.871672390370977E-5,
-      9.96668307502356E-6,
-      1.8783861793237288E-6,
-      2.5565190282238324E-7,
-      2.9495771655282715E-8,
-      6.404900533856341E-9,
-      1.5817698510075212E-9,
-      3.266320079903312E-10,
-      5.355692181504656E-11,
-      5.825085443220371E-12,
-      2.5428520886961514E-13
-    ]
-  },
-  "0.02 Second Spectral Acceleration": {
-    "xs": [
-      -5.867478567326991,
-      -5.463192009738271,
-      -5.056155809398065,
-      -4.651214124489498,
-      -4.247495741716276,
-      -3.83970234384852,
-      -3.4357888264317746,
-      -3.03032371832361,
-      -2.624168717121508,
-      -2.2164073967529934,
-      -1.8140050781753747,
-      -1.40649706843741,
-      -1.0023934309275668,
-      -0.5960204698292225,
-      -0.19116050546115904,
-      0.2151113796169455,
-      0.62057648772511,
-      1.0260415958332743,
-      1.430311246536665,
-      1.8357763546448294
-    ],
-    "ys": [
-      0.022094927654930818,
-      0.01551969204115865,
-      0.010858948449677832,
-      0.007555037306758795,
-      0.005148295299025827,
-      0.0033591700214449,
-      0.0020887756417075592,
-      0.0012264800074995705,
-      6.874327553207413E-4,
-      3.749767508983777E-4,
-      2.055977708001969E-4,
-      1.126518995122865E-4,
-      6.194418238812541E-5,
-      3.322271721279584E-5,
-      1.7079354916971006E-5,
-      8.180398260169682E-6,
-      3.5761554905769123E-6,
-      1.3861060597906542E-6,
-      4.626802255234773E-7,
-      1.2634962263263617E-7
-    ]
-  },
-  "1.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.01767570331223553,
-      0.011805262722070876,
-      0.007916998810081835,
-      0.005349510887359814,
-      0.003631753778204176,
-      0.0023847309846611905,
-      0.0014872868924913623,
-      8.357425237577044E-4,
-      4.1473832423023185E-4,
-      1.7587415044869426E-4,
-      6.245829740060085E-5,
-      1.826780074924038E-5,
-      4.428684495886055E-6,
-      1.005830828417685E-6,
-      2.5118601963486276E-7,
-      7.821406136558919E-8,
-      2.1492223169963725E-8,
-      4.927858818036696E-9,
-      8.761736248273617E-10,
-      1.0779530311320477E-10
-    ]
-  },
-  "1.50 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.010331687129850237,
-      0.0071492281397494105,
-      0.0050148599763548945,
-      0.003536961008001989,
-      0.0024537508247077996,
-      0.0015926989315314091,
-      9.509592093598605E-4,
-      4.97261235793988E-4,
-      2.2444656395444052E-4,
-      8.492499430288668E-5,
-      2.6382969646802405E-5,
-      6.551875293388738E-6,
-      1.3535398808634593E-6,
-      2.5468593832089636E-7,
-      6.82448223346306E-8,
-      1.995217055886154E-8,
-      4.942618416564459E-9,
-      1.0006245739855778E-9,
-      1.5068699403997592E-10,
-      1.3442024051744926E-11
-    ]
-  },
-  "0.25 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.03852780142350551,
-      0.025843764808380052,
-      0.01700096001878875,
-      0.01112758883637401,
-      0.007166962601323311,
-      0.004576451173077522,
-      0.002804736510976369,
-      0.0016003254973259943,
-      8.352488859325735E-4,
-      3.935143309340366E-4,
-      1.6925411394115266E-4,
-      6.857565061074137E-5,
-      2.7489760123284435E-5,
-      1.1203425458250796E-5,
-      4.575943720759225E-6,
-      1.7733415626264506E-6,
-      6.239502616436751E-7,
-      1.915954354072032E-7,
-      4.8429637957920225E-8,
-      9.46713018667407E-9
-    ]
-  },
-  "0.30 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.03723308116153551,
-      0.024646957462025505,
-      0.016003338061045196,
-      0.010352403271331814,
-      0.006603468214608308,
-      0.004187251060560331,
-      0.00255090701202397,
-      0.0014418339108460165,
-      7.377024429112525E-4,
-      3.3517993420225577E-4,
-      1.3646081123290006E-4,
-      5.144272161506125E-5,
-      1.9114484231355124E-5,
-      7.302112921445485E-6,
-      2.835730822966113E-6,
-      1.0433669016127334E-6,
-      3.451913814436548E-7,
-      9.834437197803737E-8,
-      2.2596194807247467E-8,
-      3.878865823317893E-9
-    ]
-  },
-  "3.00 Second Spectral Acceleration": {
-    "xs": [
-      -6.214608098422191,
-      -5.809142990314028,
-      -5.405902577227974,
-      -4.999695354057922,
-      -4.595219855134923,
-      -4.186459851129906,
-      -3.780994743021742,
-      -3.3784578946926658,
-      -2.972015746936675,
-      -2.566550638828511,
-      -2.162823150618887,
-      -1.7544636844843582,
-      -1.3509272172825992,
-      -0.9441759353636907,
-      -0.5395680926316447,
-      -0.13353139262452263,
-      0.2700271372130602,
-      0.6780335427498971,
-      1.0818051703517284,
-      1.4883995840570443
-    ],
-    "ys": [
-      0.005197118714592543,
-      0.0038657260956638712,
-      0.0028918507000103566,
-      0.002099076805953129,
-      0.0014334768031464343,
-      8.890469754651387E-4,
-      4.900216420228358E-4,
-      2.3290630432575815E-4,
-      9.171006248543321E-5,
-      2.93716046604876E-5,
-      7.325051256685582E-6,
-      1.3576037844935664E-6,
-      1.9719475669202581E-7,
-      3.087983423903296E-8,
-      8.342261682202136E-9,
-      2.0745222370193933E-9,
-      4.3011253630784063E-10,
-      6.709945729189854E-11,
-      6.793388519252721E-12,
-      1.8241302411305335E-13
-    ]
-  },
-  "10.00 Second Spectral Acceleration": {
-    "xs": [
-      -8.00736806798383,
-      -7.602904462212756,
-      -7.196771574447054,
-      -6.794426593675134,
-      -6.383026750047155,
-      -5.979535976242708,
-      -5.575389259887802,
-      -5.169045030843898,
-      -4.764165917478549,
-      -4.358310108056566,
-      -3.952844999948401,
-      -3.547379891840237,
-      -3.1419147837320724,
-      -2.7364496756239083,
-      -2.3309845675157437,
-      -1.9241486572738007,
-      -1.5186835491656363,
-      -1.1147416705979933,
-      -0.709276562489829,
-      -0.30381145438166457
-    ],
-    "ys": [
-      0.004834525294275608,
-      0.0038340517624876028,
-      0.0030703943972918714,
-      0.002441686324852129,
-      0.0018595483642750512,
-      0.0013307125552811212,
-      8.617922613118307E-4,
-      4.866096495728445E-4,
-      2.341746744133209E-4,
-      9.392245548261041E-5,
-      3.085929726521648E-5,
-      8.069816716039511E-6,
-      1.6286161731579916E-6,
-      2.407125957548926E-7,
-      2.247473718010326E-8,
-      2.2417712787632175E-9,
-      4.948074468155381E-10,
-      9.457284597106925E-11,
-      1.346658006912635E-11,
-      1.2034439329403008E-12
-    ]
-  },
-  "0.40 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.03306603725857932,
-      0.021627578267062422,
-      0.01391745671384597,
-      0.008954581229275973,
-      0.0056970041040736025,
-      0.003606169189479775,
-      0.0021891663404805303,
-      0.0012255602168561436,
-      6.122965633465627E-4,
-      2.6506908836601524E-4,
-      9.952838094454666E-5,
-      3.337371566963683E-5,
-      1.0842085915202045E-5,
-      3.719358651072239E-6,
-      1.338606474747649E-6,
-      4.5797207620159435E-7,
-      1.3859808587476623E-7,
-      3.523187215463454E-8,
-      6.928831009090373E-9,
-      9.535846432322872E-10
-    ]
-  },
-  "0.15 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.04420515912157223,
-      0.030844812289988404,
-      0.021080426874323547,
-      0.014282882785599246,
-      0.009490273238023128,
-      0.006232749306048353,
-      0.003936674044260231,
-      0.0023378682873924353,
-      0.0012959713479348503,
-      6.695384734647738E-4,
-      3.278416500308066E-4,
-      1.555279632627666E-4,
-      7.316430753202635E-5,
-      3.435333993542515E-5,
-      1.588344767866932E-5,
-      7.024010415039535E-6,
-      2.890789930694142E-6,
-      1.071909458012964E-6,
-      3.4227543338370214E-7,
-      9.025290675889655E-8
+      0.04184772415672416,
+      0.028519812182555622,
+      0.01902862263652819,
+      0.012597694078764633,
+      0.008183488070776037,
+      0.0052563265681882425,
+      0.0032378832457639973,
+      0.0018635316801681953,
+      9.90711951482253E-4,
+      4.8301305512369827E-4,
+      2.193587945069327E-4,
+      9.551470151347579E-5,
+      4.124782682724972E-5,
+      1.7924007974639768E-5,
+      7.691633829460732E-6,
+      3.1292561141859636E-6,
+      1.1644839692951635E-6,
+      3.8155425174464243E-7,
+      1.0444941528551557E-7,
+      2.265638077580196E-8
     ]
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2018-LOS_ANGELES_CA.json b/src/test/resources/e2e/nshm-conus-2018-LOS_ANGELES_CA.json
index e20986cbde16c9bcf96896afc9ed476169f4aefb..edcf930790a366d3a4de42d504c2842e86911016 100644
--- a/src/test/resources/e2e/nshm-conus-2018-LOS_ANGELES_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2018-LOS_ANGELES_CA.json
@@ -1,278 +1,48 @@
 {
-  "0.03 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.6555015666634474,
-      0.5056151735276282,
-      0.3800263226503472,
-      0.2801299648528963,
-      0.20008474380479285,
-      0.13933184570985524,
-      0.09305696153528026,
-      0.05918153062674783,
-      0.036000255025713676,
-      0.020883675936776477,
-      0.011518674107028217,
-      0.005988663807699813,
-      0.0028759311892256195,
-      0.0012221333396709073,
-      4.34016201218343E-4,
-      1.1980179927514817E-4,
-      2.350356566934442E-5,
-      2.694879720501566E-6,
-      1.3178139590809268E-7,
-      8.700024562678989E-10
-    ]
-  },
-  "0.10 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.8130983876196893,
-      0.6582126454081733,
-      0.5197060557328292,
-      0.40262053360856587,
-      0.3038164275716434,
-      0.22544600814493732,
-      0.1625517351226799,
-      0.11270671634160165,
-      0.07484784253745468,
-      0.047350672077645914,
-      0.028553885413723112,
-      0.016374479088263394,
-      0.008892382202291108,
-      0.004526484587810217,
-      0.002103618133768091,
-      8.509703838489375E-4,
-      2.867675418780488E-4,
-      7.557083427090538E-5,
-      1.379049959615142E-5,
-      1.3820127738087622E-6
-    ]
-  },
-  "0.50 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.8607130319038887,
-      0.6666222155769659,
-      0.4946252058731994,
-      0.35484315542146894,
-      0.24447577434618453,
-      0.16451144286348984,
-      0.10706360423243914,
-      0.066977626854467,
-      0.0403859822798272,
-      0.02343957464968879,
-      0.013117687188000549,
-      0.007040026045055555,
-      0.0035790587810941217,
-      0.0016743571839800187,
-      6.909281560837955E-4,
-      2.3872788397119533E-4,
-      6.568209275490068E-5,
-      1.3026513319599258E-5,
-      1.4999188591163306E-6,
-      6.410399984990232E-8
-    ]
-  },
-  "0.01 Second Spectral Acceleration": {
-    "xs": [
-      -6.061887011404528,
-      -5.654992310486769,
-      -5.251433780649187,
-      -4.845968672541022,
-      -4.439655747510518,
-      -4.034190639402354,
-      -3.6306105459899607,
-      -3.223888366691745,
-      -2.8184232585835804,
-      -2.4123999590012524,
-      -2.0099154790312257,
-      -1.5994875815809322,
-      -1.1973282616072674,
-      -0.789658080940789,
-      -0.3856624808119846,
-      0.01980262729617973,
-      0.4252677354043441,
-      0.8329091229351039,
-      1.235471471385307,
-      1.6428726885203377
-    ],
-    "ys": [
-      0.7869167849344857,
-      0.6166068077610417,
-      0.47022336182849944,
-      0.34926437056889564,
-      0.25325959598949793,
-      0.1788943772675917,
-      0.12213309106090883,
-      0.0794661173414853,
-      0.049355745789730995,
-      0.029247424622816952,
-      0.01659863385364813,
-      0.008807628690437623,
-      0.0044243039545326275,
-      0.0019902019120152346,
-      7.728642998466219E-4,
-      2.4048447136876255E-4,
-      5.561370476175062E-5,
-      8.19005456938885E-6,
-      6.619435702349E-7,
-      1.2056597971249248E-8
-    ]
-  },
-  "7.50 Second Spectral Acceleration": {
-    "xs": [
-      -7.602904462212756,
-      -7.196771574447054,
-      -6.794426593675134,
-      -6.383026750047155,
-      -5.979535976242708,
-      -5.575389259887802,
-      -5.169045030843898,
-      -4.764165917478549,
-      -4.358310108056566,
-      -3.952844999948401,
-      -3.547379891840237,
-      -3.1419147837320724,
-      -2.7364496756239083,
-      -2.3309845675157437,
-      -1.9241486572738007,
-      -1.5186835491656363,
-      -1.1147416705979933,
-      -0.709276562489829,
-      -0.30381145438166457,
-      0.10436001532424286
-    ],
-    "ys": [
-      0.16648116021056003,
-      0.11973543527543234,
-      0.08454737091980316,
-      0.05787860443631045,
-      0.039107622133106125,
-      0.02598447495689761,
-      0.01693387104905695,
-      0.0107323403701819,
-      0.006443782558814678,
-      0.003563293883680034,
-      0.0017579121611182736,
-      7.508699734650853E-4,
-      2.703424085560323E-4,
-      7.931434805502301E-5,
-      1.79857674292479E-5,
-      3.1134151895420147E-6,
-      4.1724364324763726E-7,
-      3.366133345053046E-8,
-      2.2290265358527014E-10,
-      0.0
-    ]
-  },
-  "0.05 Second Spectral Acceleration": {
+  "1.00 Second Spectral Acceleration": {
     "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
     ],
     "ys": [
-      0.6976612298415816,
-      0.5486923074406407,
-      0.42113613538492406,
-      0.31739115984288196,
-      0.23254246368561018,
-      0.1668371820349394,
-      0.11543995352965339,
-      0.07630113797747162,
-      0.04821539957876681,
-      0.02904922326258766,
-      0.016675854707243976,
-      0.00906931503799126,
-      0.004627921192836876,
-      0.002160334693462425,
-      8.813903594312779E-4,
-      2.963921764548152E-4,
-      7.718068736469281E-5,
-      1.4009005100953435E-5,
-      1.4194503061388815E-6,
-      5.401671870131133E-8
+      0.6366574720501088,
+      0.4718037479196399,
+      0.336364557146257,
+      0.23117962261923944,
+      0.15426255108470943,
+      0.09868641697941964,
+      0.061682269839009964,
+      0.037095482704419605,
+      0.021775137700280892,
+      0.012418053525144834,
+      0.006834724125143083,
+      0.0035759571677002966,
+      0.0017322386889934245,
+      7.490722245704206E-4,
+      2.781308992738419E-4,
+      8.55525189246937E-5,
+      1.9638736883809428E-5,
+      2.96393173511507E-6,
+      2.2713550419680115E-7,
+      2.172828515836533E-9
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -299,120 +69,28 @@
       0.7929925155296614
     ],
     "ys": [
-      0.16846386420386938,
-      0.11831204048018738,
-      0.08102647682564373,
-      0.05407101541889776,
-      0.03513250404504218,
-      0.022465589854624855,
-      0.014024122454876848,
-      0.008469077067089463,
-      0.00480309237360405,
-      0.0024619243714758977,
-      0.0011103422295134391,
-      4.306965174071669E-4,
-      1.3932588790134737E-4,
-      3.783455565223243E-5,
-      8.044017493473292E-6,
-      1.3835341257242913E-6,
-      1.5518414479584724E-7,
-      7.362387695727641E-9,
+      0.1684437724485485,
+      0.11829589663275786,
+      0.08101452065128259,
+      0.05406282717487072,
+      0.035127313944556586,
+      0.02246250359719528,
+      0.014022392026120642,
+      0.008468146251691492,
+      0.004802617000237273,
+      0.0024617049089227135,
+      0.0011102558974719061,
+      4.306689571156029E-4,
+      1.3931953053831388E-4,
+      3.7833745729080926E-5,
+      8.044063188459818E-6,
+      1.3835389066707896E-6,
+      1.5518435606411874E-7,
+      7.36238777232291E-9,
       8.557445185989779E-13,
       0.0
     ]
   },
-  "Peak Ground Velocity": {
-    "xs": [
-      -1.439695137847006,
-      -1.0356374895067213,
-      -0.6311117896404926,
-      -0.22564668153232822,
-      0.17395330712343798,
-      0.5877866649021191,
-      0.9895411936137477,
-      1.3962446919730587,
-      1.801709800081223,
-      2.2071749081893874,
-      2.6100697927420065,
-      3.0204248861443626,
-      3.4242626545931514,
-      3.828641396489095,
-      4.23410650459726,
-      4.634728988229636,
-      5.043425116919247,
-      5.4510384535657,
-      5.855071922202427,
-      6.263398262591624
-    ],
-    "ys": [
-      0.6773598642669707,
-      0.5096051999388189,
-      0.3702248062493253,
-      0.2607892516274903,
-      0.1796831508536591,
-      0.11841781206387414,
-      0.0762106557748132,
-      0.047067656338765446,
-      0.028349933142173333,
-      0.016712754227218535,
-      0.009566336595106103,
-      0.00511772587387471,
-      0.002538906618500107,
-      0.0011141793414475073,
-      4.126935059008863E-4,
-      1.2597120901883786E-4,
-      2.8912779602421184E-5,
-      4.77371646760912E-6,
-      5.144968977173029E-7,
-      2.33946031630209E-8
-    ]
-  },
-  "0.075 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.7582171511266131,
-      0.6075033750130957,
-      0.4752418204579645,
-      0.3651560114934136,
-      0.27332370554472607,
-      0.2010014160776027,
-      0.14328625423347535,
-      0.09797991503640882,
-      0.06411106399662772,
-      0.0399781084489672,
-      0.023768938784636512,
-      0.013424551772498662,
-      0.007161527011674055,
-      0.0035584476603911794,
-      0.0015945804222938446,
-      6.124340020778008E-4,
-      1.9244021911313702E-4,
-      4.608194142749144E-5,
-      7.295300124992493E-6,
-      5.937938423945731E-7
-    ]
-  },
   "Peak Ground Acceleration": {
     "xs": [
       -6.061887011404528,
@@ -437,72 +115,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.7850478121954688,
-      0.6149427090351279,
-      0.46881730133962973,
-      0.348122850747007,
-      0.252355461616518,
-      0.17818461980844943,
-      0.12157924892693428,
-      0.07904744629160573,
-      0.049058111313501684,
-      0.029050931017220935,
-      0.016476374204804276,
-      0.008736305079500252,
-      0.004383853858328634,
-      0.001968161731447079,
-      7.619072674741729E-4,
-      2.3597059544327195E-4,
-      5.422027399416736E-5,
-      7.90914606632308E-6,
-      6.32159419731787E-7,
-      1.1414649767297261E-8
-    ]
-  },
-  "2.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.28537221597062357,
-      0.19820582569957496,
-      0.1334430461992702,
-      0.0867926139620031,
-      0.054832790903475204,
-      0.033314221535367956,
-      0.020009768139943252,
-      0.011646290464513594,
-      0.0065438389055634235,
-      0.003447436989113106,
-      0.0016556701670533702,
-      7.026357432071838E-4,
-      2.543959588405738E-4,
-      7.575158050790043E-5,
-      1.734740002062045E-5,
-      2.739216779907751E-6,
-      2.1590916679503698E-7,
-      2.693228971919611E-9,
-      0.0,
-      0.0
+      0.7850465833348313,
+      0.6149388088135578,
+      0.46880770081149936,
+      0.34810417974850305,
+      0.252326595582187,
+      0.17814867226367861,
+      0.12154240052962642,
+      0.07901532677500141,
+      0.04903288877565289,
+      0.02903200372417984,
+      0.016462922915925538,
+      0.00872825444898973,
+      0.004380357672598145,
+      0.001967488906616791,
+      7.622024986858485E-4,
+      2.3627494155631915E-4,
+      5.435263402828678E-5,
+      7.931956663151682E-6,
+      6.324809604637381E-7,
+      1.1414950535737366E-8
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -529,532 +161,26 @@
       1.998773638612381
     ],
     "ys": [
-      0.9277683048900585,
-      0.753749505443325,
-      0.5931966540062881,
-      0.4554149291065007,
-      0.3391325923890992,
-      0.24811925581484062,
-      0.17664687097764015,
-      0.12126594353565415,
-      0.07988442340814564,
-      0.05017277713447225,
-      0.03010027957568584,
-      0.017258334880808454,
-      0.009440126237321218,
-      0.0048868972985768545,
-      0.002334632772972764,
-      9.820927031969802E-4,
-      3.474973045995895E-4,
-      9.761965152739225E-5,
-      1.9681532684864646E-5,
-      2.354545834986916E-6
-    ]
-  },
-  "0.75 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.8131646771557637,
-      0.6244094605714701,
-      0.4598237593662486,
-      0.3254878614220874,
-      0.2232617643687702,
-      0.14689821877565357,
-      0.09433971233733665,
-      0.05812675578130944,
-      0.03474037841563422,
-      0.02009625955702027,
-      0.011250552678425398,
-      0.00604838620873625,
-      0.0030747059989828835,
-      0.001435272926793129,
-      5.91734603818854E-4,
-      2.0850100111484315E-4,
-      5.798671840957535E-5,
-      1.1829827130264613E-5,
-      1.4551592373091144E-6,
-      7.171999526182923E-8
-    ]
-  },
-  "4.00 Second Spectral Acceleration": {
-    "xs": [
-      -6.622576336748475,
-      -6.214608098422191,
-      -5.809142990314028,
-      -5.405902577227974,
-      -4.999695354057922,
-      -4.595219855134923,
-      -4.186459851129906,
-      -3.780994743021742,
-      -3.3784578946926658,
-      -2.972015746936675,
-      -2.566550638828511,
-      -2.162823150618887,
-      -1.7544636844843582,
-      -1.3509272172825992,
-      -0.9441759353636907,
-      -0.5395680926316447,
-      -0.13353139262452263,
-      0.2700271372130602,
-      0.6780335427498971,
-      1.0818051703517284
-    ],
-    "ys": [
-      0.18446091411751517,
-      0.12844266874018262,
-      0.08712539206265854,
-      0.05746257696605665,
-      0.03675517464343605,
-      0.023069412624570785,
-      0.01412190453486065,
-      0.008378232452072218,
-      0.004678369324469715,
-      0.0023533054194598514,
-      0.0010429674210118577,
-      3.9862803261532536E-4,
-      1.2584097872029112E-4,
-      3.28097388868038E-5,
-      6.698190833397332E-6,
-      1.0344197485136563E-6,
-      9.327732206686227E-8,
-      2.3120763803070496E-9,
-      0.0,
-      0.0
-    ]
-  },
-  "0.02 Second Spectral Acceleration": {
-    "xs": [
-      -5.867478567326991,
-      -5.463192009738271,
-      -5.056155809398065,
-      -4.651214124489498,
-      -4.247495741716276,
-      -3.83970234384852,
-      -3.4357888264317746,
-      -3.03032371832361,
-      -2.624168717121508,
-      -2.2164073967529934,
-      -1.8140050781753747,
-      -1.40649706843741,
-      -1.0023934309275668,
-      -0.5960204698292225,
-      -0.19116050546115904,
-      0.2151113796169455,
-      0.62057648772511,
-      1.0260415958332743,
-      1.430311246536665,
-      1.8357763546448294
-    ],
-    "ys": [
-      0.7050458955961977,
-      0.5458509002496845,
-      0.4105816937219695,
-      0.30207639483144927,
-      0.21724803734976808,
-      0.1510541903138235,
-      0.1012488078917304,
-      0.06466445992910948,
-      0.03937835085148268,
-      0.022847958701219643,
-      0.012702650806173154,
-      0.006610864704469359,
-      0.0032029311362011385,
-      0.0013710274376685558,
-      4.926667029101458E-4,
-      1.3783614664793185E-4,
-      2.754279628624284E-5,
-      3.2337804000067757E-6,
-      1.749138513892124E-7,
-      1.1235611259268176E-9
-    ]
-  },
-  "1.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.6366732997492744,
-      0.4718266845971,
-      0.33639228064755494,
-      0.23120864554310222,
-      0.15428991843287704,
-      0.09871017875768122,
-      0.06170138879955178,
-      0.0371093605407826,
-      0.021784079087632878,
-      0.01242308232423418,
-      0.00683716038267335,
-      0.003576991765303489,
-      0.0017326159347611982,
-      7.491905663833562E-4,
-      2.781590237743464E-4,
-      8.555768302162039E-5,
-      1.963824821833813E-5,
-      2.963267138803629E-6,
-      2.2709559760524888E-7,
-      2.1726449226406575E-9
-    ]
-  },
-  "1.50 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.41591306555923535,
-      0.2952158565389781,
-      0.20260990300705048,
-      0.13436480092785613,
-      0.08650427638142505,
-      0.05335716580634719,
-      0.03232423441646581,
-      0.018984559566205775,
-      0.010910589640634728,
-      0.006021181967374712,
-      0.003128037800167616,
-      0.0014859572538182039,
-      6.242797254003681E-4,
-      2.2362983210070435E-4,
-      6.556475728756338E-5,
-      1.4754314779068779E-5,
-      2.1213534307141063E-6,
-      1.5033705453330863E-7,
-      1.3937243461051932E-9,
-      0.0
-    ]
-  },
-  "0.25 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.9466906674270203,
-      0.7646177618200823,
-      0.5961787439404052,
-      0.45217085301152343,
-      0.3317350710090117,
-      0.23875128307402005,
-      0.16698099332494237,
-      0.11248515505281206,
-      0.07269395233464407,
-      0.044821931666167304,
-      0.026443259617796963,
-      0.014935310404473236,
-      0.00805478051399395,
-      0.004103514212407189,
-      0.001914689155705081,
-      7.781748566046854E-4,
-      2.626066373737023E-4,
-      6.937636249192273E-5,
-      1.2756265432297438E-5,
-      1.364278623749353E-6
-    ]
-  },
-  "0.30 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.9496439770260106,
-      0.7619186485858396,
-      0.5884131395028442,
-      0.4409334333896402,
-      0.3188064326655659,
-      0.22576027494248418,
-      0.15513298306999956,
-      0.10257771929604512,
-      0.06509222042567046,
-      0.039464771953292135,
-      0.022933374324357502,
-      0.012770501572353002,
-      0.006787963858413264,
-      0.0033981022321102187,
-      0.0015469786485316384,
-      6.085353962992044E-4,
-      1.96928551156503E-4,
-      4.929084474678682E-5,
-      8.294077365547332E-6,
-      7.743029103903967E-7
-    ]
-  },
-  "3.00 Second Spectral Acceleration": {
-    "xs": [
-      -6.214608098422191,
-      -5.809142990314028,
-      -5.405902577227974,
-      -4.999695354057922,
-      -4.595219855134923,
-      -4.186459851129906,
-      -3.780994743021742,
-      -3.3784578946926658,
-      -2.972015746936675,
-      -2.566550638828511,
-      -2.162823150618887,
-      -1.7544636844843582,
-      -1.3509272172825992,
-      -0.9441759353636907,
-      -0.5395680926316447,
-      -0.13353139262452263,
-      0.2700271372130602,
-      0.6780335427498971,
-      1.0818051703517284,
-      1.4883995840570443
-    ],
-    "ys": [
-      0.1950843910604671,
-      0.13452980111169585,
-      0.0901147933149937,
-      0.058224297190717145,
-      0.03659014678313242,
-      0.022373522043733128,
-      0.013453414325676132,
-      0.007842106594416726,
-      0.004270550444209991,
-      0.0021205526130412262,
-      9.352512645713136E-4,
-      3.510794735873584E-4,
-      1.1140236710721198E-4,
-      2.821352367187551E-5,
-      5.432546055375964E-6,
-      6.937791864452675E-7,
-      4.2636920738185926E-8,
-      7.205378912407647E-11,
-      0.0,
-      0.0
-    ]
-  },
-  "10.00 Second Spectral Acceleration": {
-    "xs": [
-      -8.00736806798383,
-      -7.602904462212756,
-      -7.196771574447054,
-      -6.794426593675134,
-      -6.383026750047155,
-      -5.979535976242708,
-      -5.575389259887802,
-      -5.169045030843898,
-      -4.764165917478549,
-      -4.358310108056566,
-      -3.952844999948401,
-      -3.547379891840237,
-      -3.1419147837320724,
-      -2.7364496756239083,
-      -2.3309845675157437,
-      -1.9241486572738007,
-      -1.5186835491656363,
-      -1.1147416705979933,
-      -0.709276562489829,
-      -0.30381145438166457
-    ],
-    "ys": [
-      0.15155266097286074,
-      0.10987899786635288,
-      0.0779649681345172,
-      0.05437256965523532,
-      0.03694740596612714,
-      0.024954459272896697,
-      0.016580421241359358,
-      0.01068359142006486,
-      0.006564456095344429,
-      0.003733308923550901,
-      0.0019059642220421963,
-      8.433398252980378E-4,
-      3.128136953290853E-4,
-      9.344835122082741E-5,
-      2.074652001588148E-5,
-      3.0561020636068595E-6,
-      3.2122249665459E-7,
-      2.1446580149003212E-8,
-      5.7747785437406214E-11,
-      0.0
-    ]
-  },
-  "0.40 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.9180337818051649,
-      0.7233503675254502,
-      0.5467373373785206,
-      0.3999431874212782,
-      0.2814408367498209,
-      0.19364752212240158,
-      0.12904560160217807,
-      0.0826725138577559,
-      0.050921306267904975,
-      0.03008196563125172,
-      0.01709717103525385,
-      0.009326062281562906,
-      0.004847393284502007,
-      0.002349555544782598,
-      0.0010192192142259508,
-      3.753050933233597E-4,
-      1.1154051635473752E-4,
-      2.480146140845086E-5,
-      3.4351482336637624E-6,
-      2.3293100881154866E-7
-    ]
-  },
-  "0.15 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.8859206131810364,
-      0.7219206092281537,
-      0.5720369836469041,
-      0.44356536239854594,
-      0.3344681766110523,
-      0.2480014950738167,
-      0.17897725719354213,
-      0.12451086917547532,
-      0.08308550422470502,
-      0.0528328864259952,
-      0.03204816565517472,
-      0.018538569996399926,
-      0.01020622568815513,
-      0.00530947396518999,
-      0.002551738393441913,
-      0.0010828138130497122,
-      3.878984364149321E-4,
-      1.1062666896314793E-4,
-      2.2653498149750425E-5,
-      2.7051631189810914E-6
+      0.9277678999858487,
+      0.7537480330381081,
+      0.5931923233025839,
+      0.45540482519284387,
+      0.3391134734752599,
+      0.2480905374176591,
+      0.1766116798966622,
+      0.1212300246443606,
+      0.07985280215586492,
+      0.050147609948821836,
+      0.030081503068165788,
+      0.01724538444217736,
+      0.009432364207667703,
+      0.004883172427187242,
+      0.002333377346825734,
+      9.819488750632801E-4,
+      3.476070212087309E-4,
+      9.771982942272988E-5,
+      1.9713363600257578E-5,
+      2.3576513888748996E-6
     ]
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2018-NEW_MADRID_MO.json b/src/test/resources/e2e/nshm-conus-2018-NEW_MADRID_MO.json
index 40bfc17374bc4af202df559056bcc129b9921aa5..6102e18fc3d423b900b435430a656c6e98c26868 100644
--- a/src/test/resources/e2e/nshm-conus-2018-NEW_MADRID_MO.json
+++ b/src/test/resources/e2e/nshm-conus-2018-NEW_MADRID_MO.json
@@ -1,278 +1,48 @@
 {
-  "0.03 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.1134848278265555,
-      0.09913182283468468,
-      0.08486109572188505,
-      0.07092727046914521,
-      0.057236448894046575,
-      0.04487809503912896,
-      0.03408013585539021,
-      0.025149381981569217,
-      0.018220712489593675,
-      0.013052559086907245,
-      0.009340086797584427,
-      0.006735868051646523,
-      0.004944959356583585,
-      0.00372953397618328,
-      0.0028860248223204522,
-      0.002227637707450645,
-      0.0016230376347762692,
-      0.0010404778834602671,
-      5.46643844358299E-4,
-      2.2369963667561859E-4
-    ]
-  },
-  "0.10 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.13621446495131628,
-      0.11982701411071386,
-      0.10362785095989044,
-      0.08768267195514903,
-      0.07167773979178009,
-      0.05680096966073924,
-      0.04339224231034154,
-      0.03198595215220342,
-      0.022948341154975335,
-      0.01613297029753866,
-      0.011242324221471466,
-      0.007856392013920485,
-      0.005582487816364149,
-      0.0040915477718944625,
-      0.003114296210862312,
-      0.00242248222753711,
-      0.0018435531367493718,
-      0.001283485932343544,
-      7.579399966996302E-4,
-      3.583804021503561E-4
-    ]
-  },
-  "0.50 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.09332281046660419,
-      0.07091320770977323,
-      0.0519192701549374,
-      0.0369342034887083,
-      0.025413676356990177,
-      0.017332522208216742,
-      0.011758379547918807,
-      0.008030446279744276,
-      0.005629622352641184,
-      0.004112541005869439,
-      0.0031716022306450663,
-      0.0025627441124481416,
-      0.0020935058120873963,
-      0.001631662195801575,
-      0.0011340788803894165,
-      6.590074869796056E-4,
-      3.0761433422289177E-4,
-      1.12321693282798E-4,
-      3.0372827868193554E-5,
-      5.6247612758214264E-6
-    ]
-  },
-  "0.01 Second Spectral Acceleration": {
-    "xs": [
-      -6.061887011404528,
-      -5.654992310486769,
-      -5.251433780649187,
-      -4.845968672541022,
-      -4.439655747510518,
-      -4.034190639402354,
-      -3.6306105459899607,
-      -3.223888366691745,
-      -2.8184232585835804,
-      -2.4123999590012524,
-      -2.0099154790312257,
-      -1.5994875815809322,
-      -1.1973282616072674,
-      -0.789658080940789,
-      -0.3856624808119846,
-      0.01980262729617973,
-      0.4252677354043441,
-      0.8329091229351039,
-      1.235471471385307,
-      1.6428726885203377
-    ],
-    "ys": [
-      0.11272352344873258,
-      0.09627546578487826,
-      0.08052628494862434,
-      0.06545946462133588,
-      0.05154781389526944,
-      0.03934694092578511,
-      0.029235670127068347,
-      0.021201534479670117,
-      0.015182640380036187,
-      0.010815082551841342,
-      0.007756639930051291,
-      0.0056043753800527375,
-      0.004178939054831411,
-      0.0032051052237835323,
-      0.0025089666159488952,
-      0.0018996448522669656,
-      0.001288637329392049,
-      7.239131903011393E-4,
-      3.2208914278208586E-4,
-      1.0620548310292433E-4
-    ]
-  },
-  "7.50 Second Spectral Acceleration": {
-    "xs": [
-      -7.602904462212756,
-      -7.196771574447054,
-      -6.794426593675134,
-      -6.383026750047155,
-      -5.979535976242708,
-      -5.575389259887802,
-      -5.169045030843898,
-      -4.764165917478549,
-      -4.358310108056566,
-      -3.952844999948401,
-      -3.547379891840237,
-      -3.1419147837320724,
-      -2.7364496756239083,
-      -2.3309845675157437,
-      -1.9241486572738007,
-      -1.5186835491656363,
-      -1.1147416705979933,
-      -0.709276562489829,
-      -0.30381145438166457,
-      0.10436001532424286
-    ],
-    "ys": [
-      0.0108081904559991,
-      0.008113610426771556,
-      0.00617997289751241,
-      0.004782050041648119,
-      0.003835868527437465,
-      0.003192348218999202,
-      0.0027569469429383716,
-      0.0024535287496940065,
-      0.002201338605240554,
-      0.0019254189789591639,
-      0.0015816322657137313,
-      0.0011853260540007611,
-      7.930019187859976E-4,
-      4.626247837632049E-4,
-      2.2842555912412228E-4,
-      9.340027979220448E-5,
-      3.077675282754919E-5,
-      7.731698947782792E-6,
-      1.356921495644187E-6,
-      1.3672523750217962E-7
-    ]
-  },
-  "0.05 Second Spectral Acceleration": {
+  "1.00 Second Spectral Acceleration": {
     "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
     ],
     "ys": [
-      0.12354231850127388,
-      0.10906860326026185,
-      0.09468478264449222,
-      0.0804777404468467,
-      0.0661898813227246,
-      0.05287311579669837,
-      0.04080945651643373,
-      0.030465074515357734,
-      0.022180288951861225,
-      0.015849123661830302,
-      0.011232066647792725,
-      0.007972144473369948,
-      0.005731299185382305,
-      0.0042232899382015805,
-      0.003209842094681919,
-      0.0024814504656560784,
-      0.0018712154729878625,
-      0.0012857020257276218,
-      7.460096706577899E-4,
-      3.4553770179192284E-4
+      0.05460474620644813,
+      0.039322200263679656,
+      0.0277425218885836,
+      0.019256487920663257,
+      0.013309032474447959,
+      0.009158100387208452,
+      0.00646995449267356,
+      0.004711825464791657,
+      0.0036144199686035917,
+      0.0029237508993505794,
+      0.0024589761818590043,
+      0.002072470767532479,
+      0.001663505866018176,
+      0.0012069209745320137,
+      7.580051949212136E-4,
+      4.028136886385923E-4,
+      1.747374387292787E-4,
+      6.143664863718952E-5,
+      1.660370716466393E-5,
+      3.2819885795529328E-6
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -299,118 +69,26 @@
       0.7929925155296614
     ],
     "ys": [
-      0.011193915099147649,
-      0.00821706880068661,
-      0.006132250918543558,
-      0.004708251118178785,
-      0.0037471763783140924,
-      0.003115035320506513,
-      0.0026906274090445098,
-      0.0023884984070309066,
-      0.0021178411000891376,
-      0.0018013072741162991,
-      0.0014174248034200245,
-      0.0010068479452117552,
-      6.302090851652139E-4,
-      3.4448320045655297E-4,
-      1.5614112628287597E-4,
-      5.887455377759784E-5,
-      1.7483090140990465E-5,
-      3.857688945613654E-6,
-      5.776345174731303E-7,
-      3.6035666140406165E-8
-    ]
-  },
-  "Peak Ground Velocity": {
-    "xs": [
-      -1.439695137847006,
-      -1.0356374895067213,
-      -0.6311117896404926,
-      -0.22564668153232822,
-      0.17395330712343798,
-      0.5877866649021191,
-      0.9895411936137477,
-      1.3962446919730587,
-      1.801709800081223,
-      2.2071749081893874,
-      2.6100697927420065,
-      3.0204248861443626,
-      3.4242626545931514,
-      3.828641396489095,
-      4.23410650459726,
-      4.634728988229636,
-      5.043425116919247,
-      5.4510384535657,
-      5.855071922202427,
-      6.263398262591624
-    ],
-    "ys": [
-      0.07307464689943247,
-      0.05568324870828343,
-      0.041248625093993165,
-      0.029835067165871684,
-      0.02132674306817421,
-      0.014918567149395748,
-      0.010535082948253262,
-      0.007477014501481101,
-      0.005429884709865462,
-      0.0040881847171289195,
-      0.0032321807244970946,
-      0.002667378482716655,
-      0.0022590465645190867,
-      0.0018730014916641196,
-      0.0014504031529564854,
-      0.0010149705603626265,
-      6.10436644585302E-4,
-      3.0391886330731E-4,
-      1.1983425837389162E-4,
-      3.4687855302890844E-5
-    ]
-  },
-  "0.075 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.13133723026065539,
-      0.11620825221031121,
-      0.10115931417326753,
-      0.08621795553075386,
-      0.07106389445846746,
-      0.056810500072084685,
-      0.04380143618182542,
-      0.03259371813957397,
-      0.023604040260613683,
-      0.016745723573188504,
-      0.011767457777514284,
-      0.008277971731577585,
-      0.0059015408146119094,
-      0.00432054690724905,
-      0.003275323219202077,
-      0.0025422786642845313,
-      0.0019414276765604187,
-      0.0013623489529054297,
-      8.122596504603401E-4,
-      3.8778355018800545E-4
+      0.01118335095019382,
+      0.00820850133786319,
+      0.0061259943786559495,
+      0.004704029030923133,
+      0.0037445097750955776,
+      0.003113425325927084,
+      0.0026896900327019685,
+      0.0023879637030226153,
+      0.002117544110718752,
+      0.0018011501748482458,
+      0.0014173471729516552,
+      0.0010068130175955078,
+      6.301951022408454E-4,
+      3.44478169914051E-4,
+      1.5613960834869725E-4,
+      5.887416288449929E-5,
+      1.7483012613921882E-5,
+      3.857677678049852E-6,
+      5.776336202494067E-7,
+      3.603564897905062E-8
     ]
   },
   "Peak Ground Acceleration": {
@@ -437,72 +115,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.11111081987475407,
-      0.09432156805575032,
-      0.07822887498637784,
-      0.06292534352354984,
-      0.04897257268386338,
-      0.03694446546765525,
-      0.02716458911213128,
-      0.019536425202997008,
-      0.01391380513668094,
-      0.00988799840503249,
-      0.007100303838651011,
-      0.0051582932806505145,
-      0.003880368662171422,
-      0.002998080402446245,
-      0.0023374948399642473,
-      0.0017313359945210478,
-      0.0011307666558268532,
-      6.035152360837111E-4,
-      2.517568883811679E-4,
-      7.65230345759784E-5
-    ]
-  },
-  "2.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.020676759652886168,
-      0.014645101766923877,
-      0.01036904405244821,
-      0.007414940688058752,
-      0.005453548190441211,
-      0.0041475548196900245,
-      0.0033291453308429485,
-      0.0027929753391150998,
-      0.002421071396403523,
-      0.002094212876117617,
-      0.001730582106066267,
-      0.0013128807236769929,
-      8.882561628809333E-4,
-      5.237257762898687E-4,
-      2.634724343432125E-4,
-      1.115311422312698E-4,
-      3.772606468267514E-5,
-      9.888208966090819E-6,
-      1.8340394268889717E-6,
-      1.8686922920699014E-7
+      0.11111072621136199,
+      0.09432125494016416,
+      0.0782280559960046,
+      0.06292369383675943,
+      0.04897014435727335,
+      0.036942153943163344,
+      0.027163843299139248,
+      0.01953787756874624,
+      0.013915832488455517,
+      0.009887221698272164,
+      0.007094041349666846,
+      0.005146435316179508,
+      0.0038656085903222073,
+      0.00298376664089472,
+      0.0023260711475453035,
+      0.0017237133487967343,
+      0.0011265388791854099,
+      6.015982295191785E-4,
+      2.5104779111283416E-4,
+      7.632592705118942E-5
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -529,532 +161,26 @@
       1.998773638612381
     ],
     "ys": [
-      0.1355719063991374,
-      0.11487739932363839,
-      0.09473428645643736,
-      0.07576671369790458,
-      0.05806328167550452,
-      0.04307794268258901,
-      0.03089307430195546,
-      0.021542874140835666,
-      0.01480432409687213,
-      0.010125152138475377,
-      0.006999050614545422,
-      0.004968371823083338,
-      0.003676704012080431,
-      0.002843556808665984,
-      0.0022455752644871384,
-      0.001720897386123512,
-      0.0011947488883773184,
-      6.974080652911724E-4,
-      3.2138601229057806E-4,
-      1.1276339020461099E-4
-    ]
-  },
-  "0.75 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.07761788873552385,
-      0.05747437836129132,
-      0.041349511939229575,
-      0.029015011905881388,
-      0.020076101746583256,
-      0.01366180647273325,
-      0.009403128978265948,
-      0.006553098371869583,
-      0.004741085605292822,
-      0.0036025100871897556,
-      0.0028891941929087245,
-      0.002404518501214287,
-      0.0019935910890106407,
-      0.001557141406146788,
-      0.0010798612063980181,
-      6.359512656506723E-4,
-      3.03568112154357E-4,
-      1.1645840247844759E-4,
-      3.439830667344259E-5,
-      7.359570523986334E-6
-    ]
-  },
-  "4.00 Second Spectral Acceleration": {
-    "xs": [
-      -6.622576336748475,
-      -6.214608098422191,
-      -5.809142990314028,
-      -5.405902577227974,
-      -4.999695354057922,
-      -4.595219855134923,
-      -4.186459851129906,
-      -3.780994743021742,
-      -3.3784578946926658,
-      -2.972015746936675,
-      -2.566550638828511,
-      -2.162823150618887,
-      -1.7544636844843582,
-      -1.3509272172825992,
-      -0.9441759353636907,
-      -0.5395680926316447,
-      -0.13353139262452263,
-      0.2700271372130602,
-      0.6780335427498971,
-      1.0818051703517284
-    ],
-    "ys": [
-      0.012394505571051791,
-      0.008970008263961509,
-      0.006597319734761198,
-      0.004992061452230437,
-      0.003916177587165125,
-      0.003214047740074953,
-      0.002748163831050152,
-      0.0024244380889632488,
-      0.0021446320042260636,
-      0.0018222094178663635,
-      0.0014323824258365425,
-      0.001016323184322804,
-      6.334030826275008E-4,
-      3.4221338720783005E-4,
-      1.5456019456222406E-4,
-      5.7695209566334815E-5,
-      1.7039966137885163E-5,
-      3.762630060202871E-6,
-      5.703436071569525E-7,
-      3.0101045712461855E-8
-    ]
-  },
-  "0.02 Second Spectral Acceleration": {
-    "xs": [
-      -5.867478567326991,
-      -5.463192009738271,
-      -5.056155809398065,
-      -4.651214124489498,
-      -4.247495741716276,
-      -3.83970234384852,
-      -3.4357888264317746,
-      -3.03032371832361,
-      -2.624168717121508,
-      -2.2164073967529934,
-      -1.8140050781753747,
-      -1.40649706843741,
-      -1.0023934309275668,
-      -0.5960204698292225,
-      -0.19116050546115904,
-      0.2151113796169455,
-      0.62057648772511,
-      1.0260415958332743,
-      1.430311246536665,
-      1.8357763546448294
-    ],
-    "ys": [
-      0.11282092493955616,
-      0.09783809145863566,
-      0.08308835754839936,
-      0.06885149258658,
-      0.055435172149760494,
-      0.043157086572926995,
-      0.03269779359661036,
-      0.024143318475188774,
-      0.017508880684250428,
-      0.012565544952521497,
-      0.009050974636640181,
-      0.006545095379816355,
-      0.004831501700553364,
-      0.0036575262245516645,
-      0.002839358710975378,
-      0.002190317260709853,
-      0.0015870386143412823,
-      0.001007130019366774,
-      5.253338893949635E-4,
-      2.127403029380484E-4
-    ]
-  },
-  "1.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.054604496755455055,
-      0.03932193515628347,
-      0.027744294913552254,
-      0.01926212307144419,
-      0.013318671469557944,
-      0.009170199419820817,
-      0.006482154187698827,
-      0.004722252024538243,
-      0.00362220550675687,
-      0.002928932008914285,
-      0.0024621078167210374,
-      0.002074205646431156,
-      0.0016643903681060293,
-      0.0012073334945974525,
-      7.581780849408285E-4,
-      4.028779281332418E-4,
-      1.747573316930589E-4,
-      6.144171883161237E-5,
-      1.66046967040839E-5,
-      3.2821207782687475E-6
-    ]
-  },
-  "1.50 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.030983089470460266,
-      0.021956677111350947,
-      0.015412401117338683,
-      0.010788388860727862,
-      0.007652901214805016,
-      0.005530234760297339,
-      0.004189921378616015,
-      0.0033252662788531345,
-      0.0027762934087169075,
-      0.002389674357020687,
-      0.0020438587063239303,
-      0.001655730277401741,
-      0.0012162514124699206,
-      7.85122908733881E-4,
-      4.36056134305605E-4,
-      2.0611177816078687E-4,
-      7.95002070369807E-5,
-      2.4580973135856824E-5,
-      5.720155658758555E-6,
-      9.018096543741415E-7
-    ]
-  },
-  "0.25 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.12768738019575535,
-      0.10583868869062002,
-      0.08490914076439676,
-      0.06583005176363245,
-      0.04882636303703772,
-      0.035175571694935924,
-      0.024635509851719792,
-      0.016908640358285452,
-      0.01154336516602835,
-      0.007926126331477254,
-      0.005566870569291967,
-      0.004063213437140801,
-      0.0031095363120154447,
-      0.0024643200869778926,
-      0.0019471865209217255,
-      0.0014473141903368744,
-      9.438016771868971E-4,
-      5.04859042543364E-4,
-      2.1002387639883053E-4,
-      6.549765172474032E-5
-    ]
-  },
-  "0.30 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.1214762462691372,
-      0.09857915665109823,
-      0.0771563142726664,
-      0.058288310332697324,
-      0.042148585653975404,
-      0.029723924715803207,
-      0.02048646305218272,
-      0.013926531274349828,
-      0.009488473432954512,
-      0.0065604322963668926,
-      0.00468640289825777,
-      0.003507454721858546,
-      0.0027493686473037842,
-      0.0021975649336850736,
-      0.001705698427895828,
-      0.001204920198760127,
-      7.234673664048153E-4,
-      3.4898819752245754E-4,
-      1.293767037546666E-4,
-      3.522131674838307E-5
-    ]
-  },
-  "3.00 Second Spectral Acceleration": {
-    "xs": [
-      -6.214608098422191,
-      -5.809142990314028,
-      -5.405902577227974,
-      -4.999695354057922,
-      -4.595219855134923,
-      -4.186459851129906,
-      -3.780994743021742,
-      -3.3784578946926658,
-      -2.972015746936675,
-      -2.566550638828511,
-      -2.162823150618887,
-      -1.7544636844843582,
-      -1.3509272172825992,
-      -0.9441759353636907,
-      -0.5395680926316447,
-      -0.13353139262452263,
-      0.2700271372130602,
-      0.6780335427498971,
-      1.0818051703517284,
-      1.4883995840570443
-    ],
-    "ys": [
-      0.013237515505023455,
-      0.009516752968921117,
-      0.006946715142665642,
-      0.00519726745654496,
-      0.004046191137574592,
-      0.0032882847097192988,
-      0.0027964328333503403,
-      0.0024541925461277238,
-      0.0021568295812326595,
-      0.0018276756748940568,
-      0.0014418827314510328,
-      0.0010289094425708085,
-      6.552469438044283E-4,
-      3.5997715571289954E-4,
-      1.675891545365069E-4,
-      6.407803339314447E-5,
-      1.9540865863050922E-5,
-      4.336754124014392E-6,
-      6.722450788708752E-7,
-      2.0891442993068045E-8
-    ]
-  },
-  "10.00 Second Spectral Acceleration": {
-    "xs": [
-      -8.00736806798383,
-      -7.602904462212756,
-      -7.196771574447054,
-      -6.794426593675134,
-      -6.383026750047155,
-      -5.979535976242708,
-      -5.575389259887802,
-      -5.169045030843898,
-      -4.764165917478549,
-      -4.358310108056566,
-      -3.952844999948401,
-      -3.547379891840237,
-      -3.1419147837320724,
-      -2.7364496756239083,
-      -2.3309845675157437,
-      -1.9241486572738007,
-      -1.5186835491656363,
-      -1.1147416705979933,
-      -0.709276562489829,
-      -0.30381145438166457
-    ],
-    "ys": [
-      0.009853867414550514,
-      0.007504859486189197,
-      0.005780998703954952,
-      0.004556873618847975,
-      0.003681725666351429,
-      0.0030950725889771903,
-      0.0026956004841656046,
-      0.0024098908522500687,
-      0.002165328262116142,
-      0.001887712006464548,
-      0.0015399046096123933,
-      0.0011432660322519478,
-      7.5718262548171E-4,
-      4.373870854803724E-4,
-      2.1411119842643724E-4,
-      8.600755266908047E-5,
-      2.767073543620976E-5,
-      6.831275483859017E-6,
-      1.1649750299050757E-6,
-      1.20227579244594E-7
-    ]
-  },
-  "0.40 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.1069860791341022,
-      0.08369122877708077,
-      0.06298383047615598,
-      0.04584363296689707,
-      0.03209137415352912,
-      0.022105111733041,
-      0.015029720196805615,
-      0.010194851146706239,
-      0.007021654376956756,
-      0.0049804517551145355,
-      0.0037016457835203262,
-      0.002897886790863569,
-      0.0023435679520030913,
-      0.0018696994140460722,
-      0.0013824301135347454,
-      8.825749107691672E-4,
-      4.6000031869463927E-4,
-      1.8867181859132023E-4,
-      5.8310770495235196E-5,
-      1.2583607871163715E-5
-    ]
-  },
-  "0.15 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.14227658797915713,
-      0.12339654535766177,
-      0.10486181110634536,
-      0.08692254025232626,
-      0.06937505165512163,
-      0.05359443620125924,
-      0.0398925627588103,
-      0.02868449999869839,
-      0.02013675670860443,
-      0.013914624000062114,
-      0.00959094025058513,
-      0.006684612927704714,
-      0.004786186550870348,
-      0.003569611605001299,
-      0.002772767397593024,
-      0.002178750468799737,
-      0.0016369197120879786,
-      0.0010916888711503508,
-      6.002048789769093E-4,
-      2.591078486961789E-4
+      0.13557175676510388,
+      0.11487697773688867,
+      0.09473336922159183,
+      0.0757652391662049,
+      0.058061656399242906,
+      0.04307702076073272,
+      0.030893330875149033,
+      0.021543361926184883,
+      0.01480267705425384,
+      0.010119114510192404,
+      0.006988258677940675,
+      0.00495471722552012,
+      0.003663126515262555,
+      0.0028324443965858995,
+      0.002237940845752876,
+      0.0017164930070629654,
+      0.001192618055895077,
+      6.965535536645009E-4,
+      3.211131756404802E-4,
+      1.1269789534198826E-4
     ]
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2018-NEW_YORK_NY.json b/src/test/resources/e2e/nshm-conus-2018-NEW_YORK_NY.json
index a1e08ca89d335aff8b7ef21da35cb91451bbccc1..ad752c977a18bb3d6d86d98d53ad924cdc93b2d9 100644
--- a/src/test/resources/e2e/nshm-conus-2018-NEW_YORK_NY.json
+++ b/src/test/resources/e2e/nshm-conus-2018-NEW_YORK_NY.json
@@ -1,278 +1,48 @@
 {
-  "0.03 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.029229020414832364,
-      0.022031417539842703,
-      0.016494254196407168,
-      0.012301591568045346,
-      0.009014013623781132,
-      0.0065321013536410386,
-      0.004623302005328818,
-      0.00317730681566671,
-      0.002122733131448271,
-      0.0013743510977183588,
-      8.628606296271144E-4,
-      5.241047993888011E-4,
-      3.065759584403328E-4,
-      1.712198364430767E-4,
-      9.011504075753628E-5,
-      4.381854319276675E-5,
-      1.9364279059548625E-5,
-      7.590227503174238E-6,
-      2.5359210286934237E-6,
-      6.909947833423735E-7
-    ]
-  },
-  "0.10 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.04508946782931452,
-      0.03407392989117945,
-      0.025308114040829097,
-      0.018589688047246634,
-      0.013364140429630805,
-      0.009503213240419636,
-      0.006609189551436297,
-      0.004467453072325343,
-      0.002934864098242909,
-      0.0018652445618473042,
-      0.0011468304836044821,
-      6.80729695236999E-4,
-      3.8901661203090757E-4,
-      2.1294625826032832E-4,
-      1.1069466449307913E-4,
-      5.3797190649294705E-5,
-      2.413616094316903E-5,
-      9.786165264850266E-6,
-      3.459575759391259E-6,
-      1.0309414383508537E-6
-    ]
-  },
-  "0.50 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.032201990465120525,
-      0.021593365429269717,
-      0.013971810341474817,
-      0.008758503745387345,
-      0.005224337690728678,
-      0.003024340508149437,
-      0.0016826588537731681,
-      9.00372250064594E-4,
-      4.6819700157224977E-4,
-      2.3659860854449529E-4,
-      1.164860932142478E-4,
-      5.555509091005697E-5,
-      2.5357811379739985E-5,
-      1.0872539848406812E-5,
-      4.272770309687532E-6,
-      1.4876531413092648E-6,
-      4.456867367168097E-7,
-      1.0992708811922237E-7,
-      2.057527707814982E-8,
-      2.638435720665963E-9
-    ]
-  },
-  "0.01 Second Spectral Acceleration": {
-    "xs": [
-      -6.061887011404528,
-      -5.654992310486769,
-      -5.251433780649187,
-      -4.845968672541022,
-      -4.439655747510518,
-      -4.034190639402354,
-      -3.6306105459899607,
-      -3.223888366691745,
-      -2.8184232585835804,
-      -2.4123999590012524,
-      -2.0099154790312257,
-      -1.5994875815809322,
-      -1.1973282616072674,
-      -0.789658080940789,
-      -0.3856624808119846,
-      0.01980262729617973,
-      0.4252677354043441,
-      0.8329091229351039,
-      1.235471471385307,
-      1.6428726885203377
-    ],
-    "ys": [
-      0.030487689644941335,
-      0.0222309952235538,
-      0.016113039601600865,
-      0.011560152205334462,
-      0.008192610422195217,
-      0.005716634632773324,
-      0.003912944456441222,
-      0.0026050146128855046,
-      0.0016899388348488359,
-      0.001064401040271935,
-      6.527519795522027E-4,
-      3.827349101340971E-4,
-      2.1772768435632521E-4,
-      1.166338520492045E-4,
-      5.870621908511293E-5,
-      2.6957174235538327E-5,
-      1.1015891152506865E-5,
-      3.8512154609247984E-6,
-      1.1264554320643095E-6,
-      2.5222065223354705E-7
-    ]
-  },
-  "7.50 Second Spectral Acceleration": {
-    "xs": [
-      -7.602904462212756,
-      -7.196771574447054,
-      -6.794426593675134,
-      -6.383026750047155,
-      -5.979535976242708,
-      -5.575389259887802,
-      -5.169045030843898,
-      -4.764165917478549,
-      -4.358310108056566,
-      -3.952844999948401,
-      -3.547379891840237,
-      -3.1419147837320724,
-      -2.7364496756239083,
-      -2.3309845675157437,
-      -1.9241486572738007,
-      -1.5186835491656363,
-      -1.1147416705979933,
-      -0.709276562489829,
-      -0.30381145438166457,
-      0.10436001532424286
-    ],
-    "ys": [
-      0.0038405643104144197,
-      0.0025333538407675917,
-      0.0015930600282118787,
-      9.303645508525385E-4,
-      5.123432203673529E-4,
-      2.6248647213514417E-4,
-      1.2496078621912894E-4,
-      5.61386669261133E-5,
-      2.405004242324113E-5,
-      1.0004159192467759E-5,
-      4.092553781098047E-6,
-      1.639240626103427E-6,
-      6.274198498909367E-7,
-      2.2317266455490942E-7,
-      7.081122962890499E-8,
-      1.948999091234038E-8,
-      4.4560674332070585E-9,
-      7.875497856233087E-10,
-      9.769016359351767E-11,
-      6.4213261390412256E-12
-    ]
-  },
-  "0.05 Second Spectral Acceleration": {
+  "1.00 Second Spectral Acceleration": {
     "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
     ],
     "ys": [
-      0.03515143545533647,
-      0.026668256401098753,
-      0.020056597262583135,
-      0.015026782240816407,
-      0.011083590928115237,
-      0.00810568264109366,
-      0.00580270853191581,
-      0.0040368018040473925,
-      0.002727446893306626,
-      0.0017821690398090264,
-      0.0011263971901391589,
-      6.872585659672373E-4,
-      4.035693708233911E-4,
-      2.2674298273101098E-4,
-      1.207063856705654E-4,
-      5.987753513739175E-5,
-      2.729266007840972E-5,
-      1.1180597828442176E-5,
-      3.96846068172626E-6,
-      1.1762546548926665E-6
+      0.018666421015364292,
+      0.0122777143821705,
+      0.007819753747405416,
+      0.0047835883866622865,
+      0.0028112191687725903,
+      0.0015540453407317345,
+      8.285075887238437E-4,
+      4.182733081757243E-4,
+      2.0477961806545264E-4,
+      9.768413828648058E-5,
+      4.582979651500823E-5,
+      2.110815193458449E-5,
+      9.403078808734168E-6,
+      3.952177823009206E-6,
+      1.5239368107090304E-6,
+      5.283693302216128E-7,
+      1.5532448868679193E-7,
+      3.807576669004165E-8,
+      7.285190754922316E-9,
+      9.71330593082485E-10
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -299,118 +69,26 @@
       0.7929925155296614
     ],
     "ys": [
-      0.0036854838124666736,
-      0.0023361776484076375,
-      0.001403359975640254,
-      7.935368325045055E-4,
-      4.184372542740927E-4,
-      2.0756164269888008E-4,
-      9.638253492557806E-5,
-      4.288789754819488E-5,
-      1.8546553880461022E-5,
-      7.817897454637278E-6,
-      3.226362443142173E-6,
-      1.2868046875392231E-6,
-      4.797081132422995E-7,
-      1.663407204301366E-7,
-      4.973226242672997E-8,
-      1.2843826994938724E-8,
-      2.6423270052580974E-9,
-      4.082448585308853E-10,
-      3.940557499079254E-11,
-      1.5455472067805562E-12
-    ]
-  },
-  "Peak Ground Velocity": {
-    "xs": [
-      -1.439695137847006,
-      -1.0356374895067213,
-      -0.6311117896404926,
-      -0.22564668153232822,
-      0.17395330712343798,
-      0.5877866649021191,
-      0.9895411936137477,
-      1.3962446919730587,
-      1.801709800081223,
-      2.2071749081893874,
-      2.6100697927420065,
-      3.0204248861443626,
-      3.4242626545931514,
-      3.828641396489095,
-      4.23410650459726,
-      4.634728988229636,
-      5.043425116919247,
-      5.4510384535657,
-      5.855071922202427,
-      6.263398262591624
-    ],
-    "ys": [
-      0.021685687577895577,
-      0.015075982765047636,
-      0.010238206198008462,
-      0.006761177316891128,
-      0.004357157013420584,
-      0.0026672126336743968,
-      0.0015941954671015064,
-      9.087070856812795E-4,
-      4.971105608747798E-4,
-      2.6039976454441457E-4,
-      1.31280544381878E-4,
-      6.259756212346012E-5,
-      2.8887782738673014E-5,
-      1.2638273339737505E-5,
-      5.1483512040022E-6,
-      1.938543450689627E-6,
-      6.338337342107405E-7,
-      1.7763427224626776E-7,
-      4.124606864483921E-8,
-      7.212894340140318E-9
-    ]
-  },
-  "0.075 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.04070687495921074,
-      0.030966877316212737,
-      0.023243144852263555,
-      0.01731232151804917,
-      0.012658438141176323,
-      0.009165128187490223,
-      0.006492059666719395,
-      0.004468296219415897,
-      0.0029874108537433727,
-      0.0019321299808114317,
-      0.0012093358024731881,
-      7.312829103787253E-4,
-      4.261126241536129E-4,
-      2.3801930750268349E-4,
-      1.2633464507102017E-4,
-      6.272397724023676E-5,
-      2.8749890935777517E-5,
-      1.1910623934800116E-5,
-      4.305548963201032E-6,
-      1.3120431191525804E-6
+      0.003683929029161355,
+      0.0023350507514869807,
+      0.0014025796207374247,
+      7.930112908299476E-4,
+      4.180890338299987E-4,
+      2.0733134457052304E-4,
+      9.623213274255235E-5,
+      4.279209350393817E-5,
+      1.848842803384079E-5,
+      7.785121676935125E-6,
+      3.20942446688357E-6,
+      1.2788721198896172E-6,
+      4.76403657405383E-7,
+      1.651037823961913E-7,
+      4.9341854768598423E-8,
+      1.273898355111994E-8,
+      2.620252585057269E-9,
+      4.048583749596045E-10,
+      3.904486628199482E-11,
+      1.5324451927867105E-12
     ]
   },
   "Peak Ground Acceleration": {
@@ -437,72 +115,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.02987895305849752,
-      0.021699350591322907,
-      0.01562744738814085,
-      0.011107734736325522,
-      0.007777076072198725,
-      0.005350630718759938,
-      0.0036081858891389073,
-      0.0023667284311502655,
-      0.0015141080840387676,
-      9.414572717844391E-4,
-      5.705913107231007E-4,
-      3.308137682233082E-4,
-      1.862386872255785E-4,
-      9.877935542680716E-5,
-      4.926462164315479E-5,
-      2.2425903126171063E-5,
-      9.088079559403617E-6,
-      3.152446707703794E-6,
-      9.15831261374112E-7,
-      2.04211801038536E-7
-    ]
-  },
-  "2.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.006730543566267202,
-      0.004277363265921552,
-      0.002597052466307668,
-      0.0014913092577550377,
-      8.115688453111498E-4,
-      4.1043177478188416E-4,
-      2.0001309695225614E-4,
-      9.285378012220766E-5,
-      4.24220467382663E-5,
-      1.9149835034308954E-5,
-      8.521435684775992E-6,
-      3.668278761282097E-6,
-      1.4880901362411776E-6,
-      5.529378524696748E-7,
-      1.8307628611845107E-7,
-      5.288305160511686E-8,
-      1.2352584629336088E-8,
-      2.2453629748473983E-9,
-      2.7085423268315845E-10,
-      1.1658517332746617E-11
+      0.029878942979656185,
+      0.02169931498570595,
+      0.015627345176841462,
+      0.011107491120984699,
+      0.0077765862922841225,
+      0.005349775331002555,
+      0.003606839800316039,
+      0.0023647662125642096,
+      0.0015114836562529481,
+      9.383042482967954E-4,
+      5.672612883032051E-4,
+      3.2775630190425736E-4,
+      1.8379026685332687E-4,
+      9.707147245294277E-5,
+      4.8216709391054424E-5,
+      2.1867540425618328E-5,
+      8.83267345573992E-6,
+      3.054523154324784E-6,
+      8.847978732985681E-7,
+      1.967278678289316E-7
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -529,532 +161,26 @@
       1.998773638612381
     ],
     "ys": [
-      0.04830200095482366,
-      0.035049788658463754,
-      0.02474419073640949,
-      0.017095538161876245,
-      0.01141570293124972,
-      0.007483593918369606,
-      0.004771457840877622,
-      0.0029503218607147856,
-      0.0017753672046370514,
-      0.0010354312876096022,
-      5.852266835713108E-4,
-      3.193877889353911E-4,
-      1.6740382129304797E-4,
-      8.354843270104244E-5,
-      3.918786908467043E-5,
-      1.6907463893464406E-5,
-      6.583289902651269E-6,
-      2.2459922086404533E-6,
-      6.412640264871401E-7,
-      1.4629060411420142E-7
-    ]
-  },
-  "0.75 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.027512502560478557,
-      0.018387052599615282,
-      0.01191963922137439,
-      0.007450885041847866,
-      0.004495681901634502,
-      0.00256647038652915,
-      0.0014178634734368046,
-      7.433158639542217E-4,
-      3.7687607796663077E-4,
-      1.8519914818219756E-4,
-      8.899833446245393E-5,
-      4.187851030900879E-5,
-      1.9140876959475845E-5,
-      8.328916965810725E-6,
-      3.358246859094193E-6,
-      1.2278406345791873E-6,
-      3.838499104595081E-7,
-      1.0098355189308676E-7,
-      2.090906770193026E-8,
-      3.123040660431198E-9
-    ]
-  },
-  "4.00 Second Spectral Acceleration": {
-    "xs": [
-      -6.622576336748475,
-      -6.214608098422191,
-      -5.809142990314028,
-      -5.405902577227974,
-      -4.999695354057922,
-      -4.595219855134923,
-      -4.186459851129906,
-      -3.780994743021742,
-      -3.3784578946926658,
-      -2.972015746936675,
-      -2.566550638828511,
-      -2.162823150618887,
-      -1.7544636844843582,
-      -1.3509272172825992,
-      -0.9441759353636907,
-      -0.5395680926316447,
-      -0.13353139262452263,
-      0.2700271372130602,
-      0.6780335427498971,
-      1.0818051703517284
-    ],
-    "ys": [
-      0.004039150055282326,
-      0.00253426948346113,
-      0.0015113444670004808,
-      8.507777245071382E-4,
-      4.470503663974121E-4,
-      2.2113446745321066E-4,
-      1.0255652663737872E-4,
-      4.5781063323003715E-5,
-      1.9983934493483245E-5,
-      8.489086087688056E-6,
-      3.539319793139117E-6,
-      1.4262213457808956E-6,
-      5.330117557235797E-7,
-      1.8295905087019987E-7,
-      5.479978490164874E-8,
-      1.3998537757303222E-8,
-      2.8608567632198233E-9,
-      4.4125963082064334E-10,
-      4.108397953741717E-11,
-      1.241476639263941E-12
-    ]
-  },
-  "0.02 Second Spectral Acceleration": {
-    "xs": [
-      -5.867478567326991,
-      -5.463192009738271,
-      -5.056155809398065,
-      -4.651214124489498,
-      -4.247495741716276,
-      -3.83970234384852,
-      -3.4357888264317746,
-      -3.03032371832361,
-      -2.624168717121508,
-      -2.2164073967529934,
-      -1.8140050781753747,
-      -1.40649706843741,
-      -1.0023934309275668,
-      -0.5960204698292225,
-      -0.19116050546115904,
-      0.2151113796169455,
-      0.62057648772511,
-      1.0260415958332743,
-      1.430311246536665,
-      1.8357763546448294
-    ],
-    "ys": [
-      0.029650862294840683,
-      0.022142551233042547,
-      0.016396251143958866,
-      0.012076802321417874,
-      0.008813471678650767,
-      0.006311855423967767,
-      0.0044404713415211634,
-      0.0030422712161027494,
-      0.0020262941438999762,
-      0.0013087562810377676,
-      8.250372501615922E-4,
-      5.003174577348223E-4,
-      2.934189875230382E-4,
-      1.6379780990727802E-4,
-      8.640724045096433E-5,
-      4.217129293791664E-5,
-      1.8727779648667046E-5,
-      7.369570707643494E-6,
-      2.4994770282333657E-6,
-      6.950126572809033E-7
-    ]
-  },
-  "1.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.0186677611694409,
-      0.012279650448697957,
-      0.00782222015883089,
-      0.004786342248237088,
-      0.002813921982067089,
-      0.0015563956328249978,
-      8.303576781213225E-4,
-      4.1960221628397775E-4,
-      2.056682977027766E-4,
-      9.824338658505375E-5,
-      4.6163878930267385E-5,
-      2.129728061994148E-5,
-      9.503164025987253E-6,
-      4.000656728833816E-6,
-      1.5448967577748785E-6,
-      5.36310819267039E-7,
-      1.5781880055323746E-7,
-      3.871666999550434E-8,
-      7.412141868775942E-9,
-      9.889430258824986E-10
-    ]
-  },
-  "1.50 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.010226991998911769,
-      0.006610204398652571,
-      0.004108969304750587,
-      0.002432062941026012,
-      0.0013716407691312423,
-      7.220949236285958E-4,
-      3.6609544971574293E-4,
-      1.7625959013607866E-4,
-      8.308722142809531E-5,
-      3.8576323337725265E-5,
-      1.7718056109165852E-5,
-      7.953941331742562E-6,
-      3.4072798860409736E-6,
-      1.3556989184202847E-6,
-      4.874273370448805E-7,
-      1.554581104826125E-7,
-      4.126067343466818E-8,
-      8.912781676002766E-9,
-      1.4211314434395163E-9,
-      1.3053739559464791E-10
-    ]
-  },
-  "0.25 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.04449675356057531,
-      0.031655909192460766,
-      0.02185215691676664,
-      0.014712886526100803,
-      0.009531396739868626,
-      0.006047609473931129,
-      0.0037268749533283206,
-      0.002227301709719634,
-      0.0012969419336923832,
-      7.327660197333755E-4,
-      4.0153660954647837E-4,
-      2.1242731692625277E-4,
-      1.0781597424132544E-4,
-      5.198930281510678E-5,
-      2.3474845304515003E-5,
-      9.69612492057777E-6,
-      3.5864320235103834E-6,
-      1.1517569564807647E-6,
-      3.055291938258929E-7,
-      6.338058063016378E-8
-    ]
-  },
-  "0.30 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.04245304513496589,
-      0.029671928485605605,
-      0.02007317592440751,
-      0.013207458609744694,
-      0.008329091104578084,
-      0.0051325005687995594,
-      0.0030662649322989407,
-      0.0017754303472655145,
-      0.0010023744181493275,
-      5.496706524304283E-4,
-      2.9253902802282096E-4,
-      1.5026330336500885E-4,
-      7.392190800772776E-5,
-      3.442914719692367E-5,
-      1.4931404378190338E-5,
-      5.873296986233278E-6,
-      2.048586823242553E-6,
-      6.125829040078593E-7,
-      1.4866058037445373E-7,
-      2.7328116455793725E-8
-    ]
-  },
-  "3.00 Second Spectral Acceleration": {
-    "xs": [
-      -6.214608098422191,
-      -5.809142990314028,
-      -5.405902577227974,
-      -4.999695354057922,
-      -4.595219855134923,
-      -4.186459851129906,
-      -3.780994743021742,
-      -3.3784578946926658,
-      -2.972015746936675,
-      -2.566550638828511,
-      -2.162823150618887,
-      -1.7544636844843582,
-      -1.3509272172825992,
-      -0.9441759353636907,
-      -0.5395680926316447,
-      -0.13353139262452263,
-      0.2700271372130602,
-      0.6780335427498971,
-      1.0818051703517284,
-      1.4883995840570443
-    ],
-    "ys": [
-      0.0041020936769612755,
-      0.0025465295129593595,
-      0.0015046805630187566,
-      8.357867713768704E-4,
-      4.385487040853459E-4,
-      2.1594578136514535E-4,
-      1.0208458195317815E-4,
-      4.7000900310878364E-5,
-      2.110059865429143E-5,
-      9.367826953142504E-6,
-      4.088166441632511E-6,
-      1.6907063692229322E-6,
-      6.592427439871198E-7,
-      2.3094616331656161E-7,
-      7.156455093791245E-8,
-      1.8669235694062783E-8,
-      3.931185158433512E-9,
-      5.949910693595042E-10,
-      5.215452540698362E-11,
-      8.9111979950762E-13
-    ]
-  },
-  "10.00 Second Spectral Acceleration": {
-    "xs": [
-      -8.00736806798383,
-      -7.602904462212756,
-      -7.196771574447054,
-      -6.794426593675134,
-      -6.383026750047155,
-      -5.979535976242708,
-      -5.575389259887802,
-      -5.169045030843898,
-      -4.764165917478549,
-      -4.358310108056566,
-      -3.952844999948401,
-      -3.547379891840237,
-      -3.1419147837320724,
-      -2.7364496756239083,
-      -2.3309845675157437,
-      -1.9241486572738007,
-      -1.5186835491656363,
-      -1.1147416705979933,
-      -0.709276562489829,
-      -0.30381145438166457
-    ],
-    "ys": [
-      0.00353080027911796,
-      0.002351720451354432,
-      0.0014834897570438436,
-      8.830797454843222E-4,
-      4.835948297275116E-4,
-      2.486687308037858E-4,
-      1.1864829284961502E-4,
-      5.275799857576942E-5,
-      2.2347653315136746E-5,
-      9.113180771174375E-6,
-      3.6530182789183557E-6,
-      1.4338108566216486E-6,
-      5.37787107330485E-7,
-      1.8809119504936824E-7,
-      5.895244538932789E-8,
-      1.5919837671655997E-8,
-      3.573191693355046E-9,
-      6.308125218824427E-10,
-      7.910559795194343E-11,
-      5.895539970922338E-12
-    ]
-  },
-  "0.40 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.03709091105371904,
-      0.025294019919456987,
-      0.016655681094405413,
-      0.010637473231008809,
-      0.006482038762454918,
-      0.0038448683910001728,
-      0.0022015412075337302,
-      0.0012181335409125354,
-      6.569751189384613E-4,
-      3.444912324107089E-4,
-      1.755979966055446E-4,
-      8.645249007636455E-5,
-      4.0702784019765353E-5,
-      1.8059508143344098E-5,
-      7.395889141751177E-6,
-      2.711791082514212E-6,
-      8.669287413571559E-7,
-      2.3239639937976802E-7,
-      4.870324090109478E-8,
-      7.2726962469811696E-9
-    ]
-  },
-  "0.15 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.05136950701074797,
-      0.038232044662564496,
-      0.027786760595587066,
-      0.019849550523303932,
-      0.013788309292528682,
-      0.009439312047947481,
-      0.006304031876299897,
-      0.004088039557426787,
-      0.002578266189644885,
-      0.001574884242047186,
-      9.319932590704065E-4,
-      5.331288125428244E-4,
-      2.938102601378268E-4,
-      1.550383088349489E-4,
-      7.754735235068737E-5,
-      3.612502423051195E-5,
-      1.544302617828091E-5,
-      5.91210315819128E-6,
-      1.9486092634356173E-6,
-      5.328322795534525E-7
+      0.0483019839592341,
+      0.03504973561764059,
+      0.024744052454742885,
+      0.017095234304717735,
+      0.011415111740065452,
+      0.007482577963101016,
+      0.0047698738556462535,
+      0.0029480912847476017,
+      0.0017725798590443335,
+      0.0010323738247512593,
+      5.82300040838734E-4,
+      3.1694058457143036E-4,
+      1.6560745740360765E-4,
+      8.238484623559819E-5,
+      3.852324830287548E-5,
+      1.657549901909999E-5,
+      6.439186747078615E-6,
+      2.192582065492888E-6,
+      6.249719391706648E-7,
+      1.423888673803234E-7
     ]
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2018-RENO_NV.json b/src/test/resources/e2e/nshm-conus-2018-RENO_NV.json
index 3d9f5d32f0d5138feaf0e9652d42a668a3b2def9..820655cd594550a8c7b80aed734e657ae6912180 100644
--- a/src/test/resources/e2e/nshm-conus-2018-RENO_NV.json
+++ b/src/test/resources/e2e/nshm-conus-2018-RENO_NV.json
@@ -1,278 +1,48 @@
 {
-  "0.03 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.5484709651044513,
-      0.42634150573086055,
-      0.32223248501104296,
-      0.23730444678743917,
-      0.16817425454472235,
-      0.1159257861784712,
-      0.07671832754049694,
-      0.04822586125861467,
-      0.028694497876284208,
-      0.01607799794675715,
-      0.008493449764712899,
-      0.004161523587952996,
-      0.0018135273520422592,
-      6.642816954064044E-4,
-      1.9222820392779296E-4,
-      4.006683190461109E-5,
-      5.189961427054389E-6,
-      3.515398014962147E-7,
-      8.180196200340103E-9,
-      0.0
-    ]
-  },
-  "0.10 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.6685883491178775,
-      0.5420191595796071,
-      0.43073718552981316,
-      0.33604893799491375,
-      0.25450709808189137,
-      0.18855296148368073,
-      0.1352443739786887,
-      0.0931871767789666,
-      0.06140630781758366,
-      0.0383100238556121,
-      0.02255159383578808,
-      0.012494527871912603,
-      0.006467370142501192,
-      0.003051143403282391,
-      0.0012568111651209092,
-      4.2839219639801324E-4,
-      1.1440928908629895E-4,
-      2.1439456910306356E-5,
-      2.2845066791987873E-6,
-      1.2715138821373916E-7
-    ]
-  },
-  "0.50 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.7427977031018922,
-      0.5744701646291839,
-      0.42717441965285546,
-      0.30619767865158987,
-      0.20903529064641127,
-      0.13819793703629824,
-      0.08794654499288275,
-      0.053791067957904275,
-      0.03173296118183728,
-      0.017979512332664954,
-      0.009774252690314308,
-      0.0050307356835082384,
-      0.0023751420212158067,
-      9.825637057199136E-4,
-      3.399308304541865E-4,
-      9.26847250110199E-5,
-      1.8260592567417126E-5,
-      2.321891517505443E-6,
-      1.9559390767228005E-7,
-      8.58164400310693E-9
-    ]
-  },
-  "0.01 Second Spectral Acceleration": {
-    "xs": [
-      -6.061887011404528,
-      -5.654992310486769,
-      -5.251433780649187,
-      -4.845968672541022,
-      -4.439655747510518,
-      -4.034190639402354,
-      -3.6306105459899607,
-      -3.223888366691745,
-      -2.8184232585835804,
-      -2.4123999590012524,
-      -2.0099154790312257,
-      -1.5994875815809322,
-      -1.1973282616072674,
-      -0.789658080940789,
-      -0.3856624808119846,
-      0.01980262729617973,
-      0.4252677354043441,
-      0.8329091229351039,
-      1.235471471385307,
-      1.6428726885203377
-    ],
-    "ys": [
-      0.6562221966073524,
-      0.5167192191475569,
-      0.3967674370267338,
-      0.2955859740814891,
-      0.21340187032901856,
-      0.1491936613856105,
-      0.10072407601240355,
-      0.06485863310409602,
-      0.039642197744360466,
-      0.022805924534623132,
-      0.012416576695567052,
-      0.0062445519234059195,
-      0.0028960584352658203,
-      0.0011458714069513163,
-      3.7259205085927647E-4,
-      9.203567215075574E-5,
-      1.5602497752812103E-5,
-      1.4916812636004364E-6,
-      6.357138176392802E-8,
-      1.6330490298035039E-12
-    ]
-  },
-  "7.50 Second Spectral Acceleration": {
-    "xs": [
-      -7.602904462212756,
-      -7.196771574447054,
-      -6.794426593675134,
-      -6.383026750047155,
-      -5.979535976242708,
-      -5.575389259887802,
-      -5.169045030843898,
-      -4.764165917478549,
-      -4.358310108056566,
-      -3.952844999948401,
-      -3.547379891840237,
-      -3.1419147837320724,
-      -2.7364496756239083,
-      -2.3309845675157437,
-      -1.9241486572738007,
-      -1.5186835491656363,
-      -1.1147416705979933,
-      -0.709276562489829,
-      -0.30381145438166457,
-      0.10436001532424286
-    ],
-    "ys": [
-      0.15938404685403718,
-      0.11320384414420455,
-      0.07802326289991937,
-      0.05150467735657534,
-      0.03309237454258745,
-      0.020466158524096646,
-      0.012081021602011115,
-      0.006765363809486652,
-      0.003528065331949277,
-      0.0016860351101007137,
-      7.24568181144109E-4,
-      2.748755131540405E-4,
-      8.981201603823527E-5,
-      2.4345491470278362E-5,
-      5.019406825978623E-6,
-      5.832530871542725E-7,
-      2.4186203588751503E-8,
-      2.5577453686628844E-10,
-      0.0,
-      0.0
-    ]
-  },
-  "0.05 Second Spectral Acceleration": {
+  "1.00 Second Spectral Acceleration": {
     "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
     ],
     "ys": [
-      0.5803506302816213,
-      0.4601052121937963,
-      0.3559495204250222,
-      0.26904961912677555,
-      0.19633590933131825,
-      0.13968409266713883,
-      0.09580211196856152,
-      0.06275984346668122,
-      0.03909570654306335,
-      0.022975704772139574,
-      0.012747869921767593,
-      0.006639499865591477,
-      0.0031672820255649304,
-      0.0013210747055941003,
-      4.5626244374462896E-4,
-      1.2183913747385188E-4,
-      2.2865523382201614E-5,
-      2.5748573572618402E-6,
-      1.6705608122641375E-7,
-      2.938283549800887E-9
+      0.5639424382793681,
+      0.41970430872703995,
+      0.2996355631700337,
+      0.2043650649634402,
+      0.13386011296908937,
+      0.08340469061324253,
+      0.05072763584783539,
+      0.02970332088645175,
+      0.016962428614047866,
+      0.009368748098138393,
+      0.004942501068704084,
+      0.0024201010792144245,
+      0.0010564988095787106,
+      3.945561117465654E-4,
+      1.2048922319737728E-4,
+      2.8266770250121335E-5,
+      4.252380705836177E-6,
+      4.4029329263288646E-7,
+      2.573585831849357E-8,
+      8.240992980384035E-11
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -299,120 +69,28 @@
       0.7929925155296614
     ],
     "ys": [
-      0.16196643074676673,
-      0.11198090215826136,
-      0.07462347036061312,
-      0.04807408092386109,
-      0.02990757552174925,
-      0.018099210756417884,
-      0.010527852164241444,
-      0.005850400572688218,
-      0.0030252672113427353,
-      0.0013991185556806965,
-      5.609025886514626E-4,
-      1.885421245480666E-4,
-      5.036684059318227E-5,
-      1.0336861006765402E-5,
-      1.5414292790319693E-6,
-      1.7681723406863187E-7,
-      9.230149284430147E-9,
+      0.16195200240025112,
+      0.11197070315750862,
+      0.07461644808670248,
+      0.04806931482649302,
+      0.029904421907731293,
+      0.018097205110430375,
+      0.010526649862628145,
+      0.0058497036090659794,
+      0.0030248691579733383,
+      0.0013988990917255157,
+      5.607903420664931E-4,
+      1.884917390363045E-4,
+      5.034839107343867E-5,
+      1.0331505761726529E-5,
+      1.5403732253339458E-6,
+      1.766940560506774E-7,
+      9.230578884022922E-9,
       0.0,
       0.0,
       0.0
     ]
   },
-  "Peak Ground Velocity": {
-    "xs": [
-      -1.439695137847006,
-      -1.0356374895067213,
-      -0.6311117896404926,
-      -0.22564668153232822,
-      0.17395330712343798,
-      0.5877866649021191,
-      0.9895411936137477,
-      1.3962446919730587,
-      1.801709800081223,
-      2.2071749081893874,
-      2.6100697927420065,
-      3.0204248861443626,
-      3.4242626545931514,
-      3.828641396489095,
-      4.23410650459726,
-      4.634728988229636,
-      5.043425116919247,
-      5.4510384535657,
-      5.855071922202427,
-      6.263398262591624
-    ],
-    "ys": [
-      0.5965083029073476,
-      0.45467500460515264,
-      0.33391682805474876,
-      0.23499802855904472,
-      0.15915594094769347,
-      0.10171565371960661,
-      0.06334874079286507,
-      0.03790372893696496,
-      0.02202213846555048,
-      0.012410792959950009,
-      0.006754557983277139,
-      0.0033900759928531623,
-      0.0015231048187053654,
-      5.731570440935642E-4,
-      1.7260229972784145E-4,
-      4.05492979543383E-5,
-      6.61207803447021E-6,
-      7.937811985977791E-7,
-      5.592514951264712E-8,
-      4.9785128572098E-10
-    ]
-  },
-  "0.075 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.6250121589988324,
-      0.5034683097383802,
-      0.3971660100837494,
-      0.3071270600599326,
-      0.2301173271977102,
-      0.16845172081234153,
-      0.11922509229001843,
-      0.08092455729824911,
-      0.05243522080205115,
-      0.03212183270390599,
-      0.018567559572164632,
-      0.010100796108242334,
-      0.005109115104555775,
-      0.0023260734230417636,
-      9.089735473553841E-4,
-      2.884774924395747E-4,
-      6.98624697289028E-5,
-      1.1347784758768014E-5,
-      1.0847632931315094E-6,
-      5.436682029379926E-8
-    ]
-  },
   "Peak Ground Acceleration": {
     "xs": [
       -6.061887011404528,
@@ -437,72 +115,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.6547374888473556,
-      0.5154226943381538,
-      0.3956578225577323,
-      0.29466088100205357,
-      0.21265222023476063,
-      0.1486032767537395,
-      0.10027244564593973,
-      0.06452577320029962,
-      0.03940815520238865,
-      0.022652368959960246,
-      0.01232299969196451,
-      0.006191315123447127,
-      0.0028666066275044085,
-      0.0011311358459255593,
-      3.6645142364535285E-4,
-      9.012051688793554E-5,
-      1.5208067506146952E-5,
-      1.449376027952755E-6,
-      6.081007073464305E-8,
-      1.6330490298035039E-12
-    ]
-  },
-  "2.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.2640715047138875,
-      0.1826228038515229,
-      0.12082264622510536,
-      0.07653228178408117,
-      0.04697375730558731,
-      0.02768343250809886,
-      0.01605429352077038,
-      0.008923343255889336,
-      0.004726884904476877,
-      0.002305206378588326,
-      9.994380526174027E-4,
-      3.7117390123831697E-4,
-      1.1354022748814751E-4,
-      2.677384571241463E-5,
-      4.291466467573075E-6,
-      4.807446110566275E-7,
-      2.981252893753843E-8,
-      3.285759703070023E-11,
-      0.0,
-      0.0
+      0.6547357887817038,
+      0.5154175476805015,
+      0.3956456162265481,
+      0.29463778537314556,
+      0.21261726439098355,
+      0.14856083770157558,
+      0.1002311229879195,
+      0.06449394268051883,
+      0.0393892832339914,
+      0.02264433896405345,
+      0.01232106975342074,
+      0.006191664090278571,
+      0.0028672800399024167,
+      0.0011315854751875179,
+      3.666664317975439E-4,
+      9.021209601637859E-5,
+      1.523566711127091E-5,
+      1.4539154793262797E-6,
+      6.099357830874233E-8,
+      4.063222371389606E-12
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -529,532 +161,26 @@
       1.998773638612381
     ],
     "ys": [
-      0.7737526421843504,
-      0.6261600545937951,
-      0.49430831566150935,
-      0.3815364819094134,
-      0.2850163303227345,
-      0.20814720204576534,
-      0.1473040215173955,
-      0.10037713490933756,
-      0.06565549372771498,
-      0.04083708459675917,
-      0.024083869210349176,
-      0.013449996233783361,
-      0.007078882723668816,
-      0.0034338665578945897,
-      0.0014726006360996594,
-      5.302872775866811E-4,
-      1.5317221742341033E-4,
-      3.2834733118934725E-5,
-      4.546969501740453E-6,
-      3.354215850341688E-7
-    ]
-  },
-  "0.75 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.7140104142660204,
-      0.5487532340738513,
-      0.40539548861370645,
-      0.2867445463881163,
-      0.19475659104277002,
-      0.12557674371895414,
-      0.07860577815507422,
-      0.04714610820877979,
-      0.02745295566416237,
-      0.01545712039883275,
-      0.008390827192847467,
-      0.004322586459151271,
-      0.0020451090783288567,
-      8.510202557490922E-4,
-      2.982104797915927E-4,
-      8.440195356692111E-5,
-      1.690996227269994E-5,
-      2.1594968972727614E-6,
-      1.8566715567507898E-7,
-      7.46609892029724E-9
-    ]
-  },
-  "4.00 Second Spectral Acceleration": {
-    "xs": [
-      -6.622576336748475,
-      -6.214608098422191,
-      -5.809142990314028,
-      -5.405902577227974,
-      -4.999695354057922,
-      -4.595219855134923,
-      -4.186459851129906,
-      -3.780994743021742,
-      -3.3784578946926658,
-      -2.972015746936675,
-      -2.566550638828511,
-      -2.162823150618887,
-      -1.7544636844843582,
-      -1.3509272172825992,
-      -0.9441759353636907,
-      -0.5395680926316447,
-      -0.13353139262452263,
-      0.2700271372130602,
-      0.6780335427498971,
-      1.0818051703517284
-    ],
-    "ys": [
-      0.17666963632101226,
-      0.12133069138446922,
-      0.08022188136651195,
-      0.051235393071209306,
-      0.03157668939113907,
-      0.018938705339079875,
-      0.0109242377866287,
-      0.0060234216241085445,
-      0.0030875199731378055,
-      0.0014035317688189891,
-      5.506135842353327E-4,
-      1.8088033582752447E-4,
-      4.6676458459480914E-5,
-      9.168718791001728E-6,
-      1.3632472537746268E-6,
-      1.4246356712261984E-7,
-      5.689676095198022E-9,
-      0.0,
-      0.0,
-      0.0
-    ]
-  },
-  "0.02 Second Spectral Acceleration": {
-    "xs": [
-      -5.867478567326991,
-      -5.463192009738271,
-      -5.056155809398065,
-      -4.651214124489498,
-      -4.247495741716276,
-      -3.83970234384852,
-      -3.4357888264317746,
-      -3.03032371832361,
-      -2.624168717121508,
-      -2.2164073967529934,
-      -1.8140050781753747,
-      -1.40649706843741,
-      -1.0023934309275668,
-      -0.5960204698292225,
-      -0.19116050546115904,
-      0.2151113796169455,
-      0.62057648772511,
-      1.0260415958332743,
-      1.430311246536665,
-      1.8357763546448294
-    ],
-    "ys": [
-      0.589119878586821,
-      0.4592245891711968,
-      0.34752557268891276,
-      0.25571773297469874,
-      0.18259148902483174,
-      0.12556805851427008,
-      0.08332600502575269,
-      0.052630496695827325,
-      0.03138922993027181,
-      0.01758817001745165,
-      0.009356663419967607,
-      0.004587605120535525,
-      0.002021121947276102,
-      7.481299022964761E-4,
-      2.2119091668227765E-4,
-      4.7916789999390056E-5,
-      6.696291315259916E-6,
-      4.804654448493943E-7,
-      1.1516104222165637E-8,
-      0.0
-    ]
-  },
-  "1.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.5639616222323354,
-      0.4197313642069559,
-      0.2996668619295505,
-      0.20439532010387382,
-      0.1338851430115078,
-      0.08342268793874501,
-      0.0507392461681369,
-      0.029709913422455096,
-      0.01696565550104996,
-      0.009370013891092153,
-      0.004942865938416689,
-      0.0024201852177880142,
-      0.0010565309623285762,
-      3.945822214271397E-4,
-      1.2050379281836553E-4,
-      2.827275629819673E-5,
-      4.252987172414418E-6,
-      4.3993568072212026E-7,
-      2.5675597124458143E-8,
-      8.185945759284624E-11
-    ]
-  },
-  "1.50 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.37749623988871084,
-      0.2690213881320578,
-      0.1833998589302422,
-      0.11929970193634522,
-      0.0747297863748027,
-      0.044710787243442164,
-      0.026270082859352967,
-      0.014893320992740544,
-      0.008196230028190327,
-      0.004277665043674195,
-      0.00205589820338719,
-      8.752858066867912E-4,
-      3.1770061670493183E-4,
-      9.408311615023739E-5,
-      2.098197679653356E-5,
-      3.1434808162138656E-6,
-      3.162472380271222E-7,
-      1.7140081233678718E-8,
-      7.634745577394821E-16,
-      0.0
-    ]
-  },
-  "0.25 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.7961538389909498,
-      0.6401165081354302,
-      0.5003882057780854,
-      0.3811390870368981,
-      0.2799092897945471,
-      0.20049715228188653,
-      0.13894290436621784,
-      0.09264281236861077,
-      0.0593039642509012,
-      0.036130374258629916,
-      0.020913670438523203,
-      0.011489842103847299,
-      0.0059430704826647866,
-      0.002811294269019971,
-      0.0011611109797750273,
-      3.9734019439642256E-4,
-      1.0748304031042877E-4,
-      2.108571704484795E-5,
-      2.6623655356422743E-6,
-      1.7729655852351794E-7
-    ]
-  },
-  "0.30 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.8051753704615483,
-      0.642867292529615,
-      0.4973957428842988,
-      0.3738153285205409,
-      0.2699641750191863,
-      0.1897591740141103,
-      0.1288368228147903,
-      0.08409817384457595,
-      0.052719769963219254,
-      0.031492169306515876,
-      0.017911492539334734,
-      0.009680425409161824,
-      0.004909876627854312,
-      0.0022580565114179276,
-      8.973172845918253E-4,
-      2.923584965186468E-4,
-      7.410266566849717E-5,
-      1.3222333471579326E-5,
-      1.4572982508022397E-6,
-      8.915384651070523E-8
-    ]
-  },
-  "3.00 Second Spectral Acceleration": {
-    "xs": [
-      -6.214608098422191,
-      -5.809142990314028,
-      -5.405902577227974,
-      -4.999695354057922,
-      -4.595219855134923,
-      -4.186459851129906,
-      -3.780994743021742,
-      -3.3784578946926658,
-      -2.972015746936675,
-      -2.566550638828511,
-      -2.162823150618887,
-      -1.7544636844843582,
-      -1.3509272172825992,
-      -0.9441759353636907,
-      -0.5395680926316447,
-      -0.13353139262452263,
-      0.2700271372130602,
-      0.6780335427498971,
-      1.0818051703517284,
-      1.4883995840570443
-    ],
-    "ys": [
-      0.18445270519564244,
-      0.12543146093230978,
-      0.08196374295065205,
-      0.051395949698150985,
-      0.03128511210788132,
-      0.018415550404545636,
-      0.010541533559122056,
-      0.0057746322779657164,
-      0.0029133611100271577,
-      0.0013181986306399708,
-      5.181037839504154E-4,
-      1.6801401537104148E-4,
-      4.4133955864045494E-5,
-      8.39785189999223E-6,
-      1.147411484554418E-6,
-      1.0290179399316243E-7,
-      2.8617799449288303E-9,
-      0.0,
-      0.0,
-      0.0
-    ]
-  },
-  "10.00 Second Spectral Acceleration": {
-    "xs": [
-      -8.00736806798383,
-      -7.602904462212756,
-      -7.196771574447054,
-      -6.794426593675134,
-      -6.383026750047155,
-      -5.979535976242708,
-      -5.575389259887802,
-      -5.169045030843898,
-      -4.764165917478549,
-      -4.358310108056566,
-      -3.952844999948401,
-      -3.547379891840237,
-      -3.1419147837320724,
-      -2.7364496756239083,
-      -2.3309845675157437,
-      -1.9241486572738007,
-      -1.5186835491656363,
-      -1.1147416705979933,
-      -0.709276562489829,
-      -0.30381145438166457
-    ],
-    "ys": [
-      0.14529892871455688,
-      0.10399868481651385,
-      0.07210790487674046,
-      0.04863075259176209,
-      0.031402278398197106,
-      0.01965860520416791,
-      0.011722127539940118,
-      0.006572772195806168,
-      0.003453954860998045,
-      0.0016881894466268378,
-      7.701009424225697E-4,
-      3.2816184182666436E-4,
-      1.2949914504415118E-4,
-      4.6257563824511955E-5,
-      1.4291347354710104E-5,
-      3.3267256881312082E-6,
-      4.124760555529519E-7,
-      1.8814234117170077E-9,
-      0.0,
-      0.0
-    ]
-  },
-  "0.40 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.785970099957112,
-      0.6171679810865592,
-      0.46740782776745365,
-      0.3422190271094566,
-      0.23943759320980393,
-      0.16251273283506876,
-      0.10630295962573366,
-      0.06683056177859258,
-      0.040440862966107056,
-      0.02342011278592998,
-      0.0129819176556975,
-      0.006841167948083581,
-      0.003348680621544215,
-      0.0014578877282670133,
-      5.375897747222688E-4,
-      1.588578792958377E-4,
-      3.518934163119443E-5,
-      5.151492188128392E-6,
-      4.710463700964477E-7,
-      2.3691931750097672E-8
-    ]
-  },
-  "0.15 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.7317123689623674,
-      0.5946666104685694,
-      0.47293114559979477,
-      0.36889113071038065,
-      0.27929805611154157,
-      0.20699773626883747,
-      0.14872136769212127,
-      0.10283529465156153,
-      0.06816636318261288,
-      0.04289522373026921,
-      0.02553151518778698,
-      0.014343740463961715,
-      0.0075733614683961,
-      0.003685860801539449,
-      0.0015912091962243106,
-      5.79425990020153E-4,
-      1.6984979216320303E-4,
-      3.696253359097814E-5,
-      5.097500734709375E-6,
-      3.6370620870519366E-7
+      0.7737520693137596,
+      0.626158058671475,
+      0.4943026693905384,
+      0.3815237316109364,
+      0.2849928378328236,
+      0.20811270361164624,
+      0.14726293268062962,
+      0.10033741214019079,
+      0.06562437576887947,
+      0.04081755703105158,
+      0.02407438562720991,
+      0.013446854247539832,
+      0.007078613802080741,
+      0.0034343346589473444,
+      0.0014729955574711105,
+      5.304815215680369E-4,
+      1.5325010460188717E-4,
+      3.2864405116884194E-5,
+      4.5541957008082325E-6,
+      3.3625843088903307E-7
     ]
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2018-SALT_LAKE_CITY_UT.json b/src/test/resources/e2e/nshm-conus-2018-SALT_LAKE_CITY_UT.json
index f1faa3cc828d2f79b33ef08ba5ae4a087dd6b384..5cf2e8237254aad406ec27b5b79beac72891ed41 100644
--- a/src/test/resources/e2e/nshm-conus-2018-SALT_LAKE_CITY_UT.json
+++ b/src/test/resources/e2e/nshm-conus-2018-SALT_LAKE_CITY_UT.json
@@ -1,278 +1,48 @@
 {
-  "0.03 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.11290472351290834,
-      0.08482604998328358,
-      0.06198730458323689,
-      0.04432895238812979,
-      0.030722817757724476,
-      0.020976762714174396,
-      0.014042075170487127,
-      0.009277632028751471,
-      0.006171699690632983,
-      0.00418780099763037,
-      0.0028983183932961543,
-      0.0019849754716164516,
-      0.001267075637690718,
-      6.99290074966401E-4,
-      3.111552450699009E-4,
-      1.0479358392178282E-4,
-      2.5232904767932092E-5,
-      3.844732508847212E-6,
-      2.95482531349518E-7,
-      2.8285762787333333E-8
-    ]
-  },
-  "0.10 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.14891650251439914,
-      0.1165698431543995,
-      0.08877633089481413,
-      0.06612729239203499,
-      0.047764771890219375,
-      0.033945340075890215,
-      0.023608682836928886,
-      0.016076462032547548,
-      0.010816850119410202,
-      0.00726116291384337,
-      0.004939856951688628,
-      0.0034218094800958286,
-      0.002375975392237743,
-      0.0015854730545538781,
-      9.524819491578974E-4,
-      4.788161418244004E-4,
-      1.906089599530629E-4,
-      5.706083591108181E-5,
-      1.153190077175306E-5,
-      1.1800016056549461E-6
-    ]
-  },
-  "0.50 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.14152353302870888,
-      0.10540930125524231,
-      0.07599865905296013,
-      0.0534929182857648,
-      0.03645494414807771,
-      0.024505281085740484,
-      0.016176057501622976,
-      0.010544237079793897,
-      0.006913172462296638,
-      0.004628138819524176,
-      0.003186191907575355,
-      0.002204235992624195,
-      0.0014554286990701086,
-      8.580200677916632E-4,
-      4.2468748674269366E-4,
-      1.6783355286218116E-4,
-      5.0909241696795875E-5,
-      1.0892399035995148E-5,
-      1.2207988774824946E-6,
-      4.9691016836012847E-8
-    ]
-  },
-  "0.01 Second Spectral Acceleration": {
-    "xs": [
-      -6.061887011404528,
-      -5.654992310486769,
-      -5.251433780649187,
-      -4.845968672541022,
-      -4.439655747510518,
-      -4.034190639402354,
-      -3.6306105459899607,
-      -3.223888366691745,
-      -2.8184232585835804,
-      -2.4123999590012524,
-      -2.0099154790312257,
-      -1.5994875815809322,
-      -1.1973282616072674,
-      -0.789658080940789,
-      -0.3856624808119846,
-      0.01980262729617973,
-      0.4252677354043441,
-      0.8329091229351039,
-      1.235471471385307,
-      1.6428726885203377
-    ],
-    "ys": [
-      0.13130542918084218,
-      0.09920708263794797,
-      0.0730410539234071,
-      0.0523706617411343,
-      0.03669935076630554,
-      0.025227845034026565,
-      0.01705885948958618,
-      0.011333385075210218,
-      0.007515641411657664,
-      0.005054421134346741,
-      0.0034926417628015037,
-      0.0024166700795131887,
-      0.0016191511381332645,
-      9.60041502066064E-4,
-      4.701021752459026E-4,
-      1.7662597415549715E-4,
-      4.824164735650992E-5,
-      8.57457482406851E-6,
-      7.695406383983346E-7,
-      2.3923173727462614E-8
-    ]
-  },
-  "7.50 Second Spectral Acceleration": {
-    "xs": [
-      -7.602904462212756,
-      -7.196771574447054,
-      -6.794426593675134,
-      -6.383026750047155,
-      -5.979535976242708,
-      -5.575389259887802,
-      -5.169045030843898,
-      -4.764165917478549,
-      -4.358310108056566,
-      -3.952844999948401,
-      -3.547379891840237,
-      -3.1419147837320724,
-      -2.7364496756239083,
-      -2.3309845675157437,
-      -1.9241486572738007,
-      -1.5186835491656363,
-      -1.1147416705979933,
-      -0.709276562489829,
-      -0.30381145438166457,
-      0.10436001532424286
-    ],
-    "ys": [
-      0.03297988800913183,
-      0.02487155278790097,
-      0.018237236277994034,
-      0.012871297018326927,
-      0.008927305459693159,
-      0.006093604249681078,
-      0.004090371844266971,
-      0.0026634753408331644,
-      0.0016180141763978372,
-      8.783035691169979E-4,
-      4.0882517462079566E-4,
-      1.5757870708040713E-4,
-      4.83755565297435E-5,
-      1.0985516372953573E-5,
-      1.6042302598899142E-6,
-      1.3612845733228153E-7,
-      3.335733694174926E-9,
-      3.10246665893534E-11,
-      3.9583783444731E-12,
-      3.2011136066368834E-13
-    ]
-  },
-  "0.05 Second Spectral Acceleration": {
+  "1.00 Second Spectral Acceleration": {
     "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
     ],
     "ys": [
-      0.12478708689477366,
-      0.09563297394459479,
-      0.07136451302800746,
-      0.05212713272564934,
-      0.03691309985876692,
-      0.025725108934976017,
-      0.017545176074138635,
-      0.01174405798934561,
-      0.007830769895655858,
-      0.005273217717252964,
-      0.003624257888163116,
-      0.002512889254994475,
-      0.0016903273856943184,
-      0.0010350087173543064,
-      5.374488468387425E-4,
-      2.2164409352361727E-4,
-      6.910109222445237E-5,
-      1.5087236292580237E-5,
-      1.973173554230145E-6,
-      1.355538957446437E-7
+      0.10141210582180435,
+      0.07447849798602046,
+      0.05330127231316856,
+      0.037102818795138215,
+      0.025232028167263765,
+      0.016610346496346337,
+      0.010874067593129606,
+      0.00708922479836808,
+      0.004735625457686325,
+      0.0032494647560939514,
+      0.002245495226811023,
+      0.0014914478772558573,
+      8.988552768687257E-4,
+      4.656680939512108E-4,
+      1.9882970591587773E-4,
+      6.785029212800548E-5,
+      1.6876651512201575E-5,
+      2.653741741725593E-6,
+      1.7318139402766213E-7,
+      1.0355704040041718E-10
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -299,118 +69,26 @@
       0.7929925155296614
     ],
     "ys": [
-      0.03338767245908018,
-      0.024651370360242723,
-      0.017644467917228443,
-      0.01226982556447926,
-      0.008337171328643913,
-      0.005635233382380598,
-      0.0037897469352202186,
-      0.0025161184760282805,
-      0.0015874850273620417,
-      9.014964484782114E-4,
-      4.404332924718773E-4,
-      1.7808639963686447E-4,
-      5.682589284999951E-5,
-      1.392667371386848E-5,
-      2.112332198593091E-6,
-      1.7866448028632124E-7,
-      2.9165389363271214E-9,
-      1.3617788308680626E-11,
-      1.4861536901039684E-12,
-      7.43042590538161E-14
-    ]
-  },
-  "Peak Ground Velocity": {
-    "xs": [
-      -1.439695137847006,
-      -1.0356374895067213,
-      -0.6311117896404926,
-      -0.22564668153232822,
-      0.17395330712343798,
-      0.5877866649021191,
-      0.9895411936137477,
-      1.3962446919730587,
-      1.801709800081223,
-      2.2071749081893874,
-      2.6100697927420065,
-      3.0204248861443626,
-      3.4242626545931514,
-      3.828641396489095,
-      4.23410650459726,
-      4.634728988229636,
-      5.043425116919247,
-      5.4510384535657,
-      5.855071922202427,
-      6.263398262591624
-    ],
-    "ys": [
-      0.10859955033228544,
-      0.08115966491212172,
-      0.05943858440111824,
-      0.04259004738711252,
-      0.029949590305096578,
-      0.02022905904983542,
-      0.01346719245759846,
-      0.00879529135175617,
-      0.005811833206321103,
-      0.003971353950419028,
-      0.002799956017557912,
-      0.001932910336320483,
-      0.0012305155585935572,
-      6.611143390059961E-4,
-      2.779635359082197E-4,
-      8.780759911865637E-5,
-      1.8618865079260464E-5,
-      2.183960375461381E-6,
-      1.1451773282811418E-7,
-      2.085040268806834E-10
-    ]
-  },
-  "0.075 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.1379657582304851,
-      0.10738202598724675,
-      0.08139783183654052,
-      0.06038953204839809,
-      0.04344900506899976,
-      0.03075174630215055,
-      0.021290649305424257,
-      0.014433093118562921,
-      0.009685288151396906,
-      0.006507451249771829,
-      0.0044434070765598434,
-      0.003083655940824873,
-      0.0021256408952166307,
-      0.0013838959237783962,
-      7.937335300505068E-4,
-      3.7345961541783304E-4,
-      1.3691548765668198E-4,
-      3.7140529951418917E-5,
-      6.440920703707675E-6,
-      5.526968420509645E-7
+      0.03338701576491687,
+      0.02465096645560166,
+      0.017644230719297157,
+      0.012269680846161648,
+      0.008337057201618094,
+      0.005635024432572456,
+      0.0037891327023550246,
+      0.0025149123784953846,
+      0.001586342905921711,
+      9.014315449747967E-4,
+      4.414029650416536E-4,
+      1.7921117169766217E-4,
+      5.7541181003569944E-5,
+      1.4224526877692227E-5,
+      2.2078569144162733E-6,
+      1.888075384391226E-7,
+      2.916565870061635E-9,
+      1.353319468129786E-11,
+      1.4761223207476851E-12,
+      7.365315902026219E-14
     ]
   },
   "Peak Ground Acceleration": {
@@ -437,72 +115,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.13047111279084145,
-      0.09849744021434431,
-      0.07246089256506401,
-      0.05191956664718638,
-      0.03636711256986868,
-      0.024995377451826506,
-      0.016903022882739732,
-      0.011233225426825736,
-      0.007453740328047975,
-      0.005017565965723191,
-      0.0034707218275950615,
-      0.0024030148122227437,
-      0.0016093744733757958,
-      9.524273159710858E-4,
-      4.6471771571778497E-4,
-      1.7370654153273435E-4,
-      4.713127906414366E-5,
-      8.308800503166572E-6,
-      7.378638142760129E-7,
-      2.1801027730086493E-8
-    ]
-  },
-  "2.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.049023102379780185,
-      0.03533554686682801,
-      0.024702231232974586,
-      0.016709089900700927,
-      0.01107517993449211,
-      0.0072287445144646675,
-      0.004828597717547538,
-      0.0032726370841274824,
-      0.0022207887508924103,
-      0.0014339505309423062,
-      8.342863915630456E-4,
-      4.1609674307751914E-4,
-      1.7106278557419856E-4,
-      5.570644710628459E-5,
-      1.3407700164570706E-5,
-      2.033348451430461E-6,
-      1.3028671987054298E-7,
-      4.735371876431582E-10,
-      6.901694883941034E-12,
-      3.570441022726219E-13
+      0.13047100258720737,
+      0.09849712329595017,
+      0.07246017969843055,
+      0.05191828655903308,
+      0.03636526505318483,
+      0.02499321774137477,
+      0.01690096807101634,
+      0.011231650127527283,
+      0.007452801108191979,
+      0.005017181957434343,
+      0.0034705679298442814,
+      0.0024023685398152327,
+      0.0016078002266633952,
+      9.514053815001429E-4,
+      4.656644721669268E-4,
+      1.753633004388021E-4,
+      4.811667218966292E-5,
+      8.632653500921544E-6,
+      8.008388400062673E-7,
+      2.2680106464068327E-8
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -529,532 +161,26 @@
       1.998773638612381
     ],
     "ys": [
-      0.1674095479390562,
-      0.1301828663924586,
-      0.0980236850845097,
-      0.0720106580098315,
-      0.051298005144402886,
-      0.03606769570914023,
-      0.0249181303359597,
-      0.016915118368841308,
-      0.011364987994553129,
-      0.007620725739371359,
-      0.005186867906632733,
-      0.00361172825531893,
-      0.0025397919401390044,
-      0.0017318860166166067,
-      0.0010734922720126079,
-      5.634368545917139E-4,
-      2.3810617820970697E-4,
-      7.770788291687493E-5,
-      1.817714548899726E-5,
-      2.5644461664892534E-6
-    ]
-  },
-  "0.75 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.13240092375107573,
-      0.09888915244992791,
-      0.07179444739468081,
-      0.05068527431443673,
-      0.0349766488480483,
-      0.023348525170934536,
-      0.015402143694432992,
-      0.009987088001855656,
-      0.006534473367217704,
-      0.004373797798407618,
-      0.0030065727919217407,
-      0.002069220046226864,
-      0.0013554564498975193,
-      7.957148542101317E-4,
-      3.9658036110782057E-4,
-      1.62322819516467E-4,
-      5.107812441736089E-5,
-      1.1724129526884705E-5,
-      1.5756789551443569E-6,
-      8.287805154653518E-8
-    ]
-  },
-  "4.00 Second Spectral Acceleration": {
-    "xs": [
-      -6.622576336748475,
-      -6.214608098422191,
-      -5.809142990314028,
-      -5.405902577227974,
-      -4.999695354057922,
-      -4.595219855134923,
-      -4.186459851129906,
-      -3.780994743021742,
-      -3.3784578946926658,
-      -2.972015746936675,
-      -2.566550638828511,
-      -2.162823150618887,
-      -1.7544636844843582,
-      -1.3509272172825992,
-      -0.9441759353636907,
-      -0.5395680926316447,
-      -0.13353139262452263,
-      0.2700271372130602,
-      0.6780335427498971,
-      1.0818051703517284
-    ],
-    "ys": [
-      0.03576030493200083,
-      0.026202168766476148,
-      0.018608596342105536,
-      0.012821895843204392,
-      0.008613235781113959,
-      0.005759478899210132,
-      0.0038549541603860845,
-      0.0025752455066301934,
-      0.001652370099495075,
-      9.5742789633944E-4,
-      4.782891840165266E-4,
-      1.980431106503677E-4,
-      6.42663180930338E-5,
-      1.574423334643016E-5,
-      2.395402504706443E-6,
-      1.9370466334661845E-7,
-      2.5274483239655485E-9,
-      1.3583186060690344E-11,
-      1.4285232786228953E-12,
-      5.907268566547748E-14
-    ]
-  },
-  "0.02 Second Spectral Acceleration": {
-    "xs": [
-      -5.867478567326991,
-      -5.463192009738271,
-      -5.056155809398065,
-      -4.651214124489498,
-      -4.247495741716276,
-      -3.83970234384852,
-      -3.4357888264317746,
-      -3.03032371832361,
-      -2.624168717121508,
-      -2.2164073967529934,
-      -1.8140050781753747,
-      -1.40649706843741,
-      -1.0023934309275668,
-      -0.5960204698292225,
-      -0.19116050546115904,
-      0.2151113796169455,
-      0.62057648772511,
-      1.0260415958332743,
-      1.430311246536665,
-      1.8357763546448294
-    ],
-    "ys": [
-      0.11960143671458692,
-      0.08994678263729793,
-      0.06567071666493385,
-      0.04682933258008001,
-      0.03266621945243448,
-      0.022215933473560417,
-      0.014874464432810527,
-      0.009822641394994157,
-      0.006503494685473495,
-      0.0043881276226947425,
-      0.0030419487954375744,
-      0.002088234964816742,
-      0.0013479274387119234,
-      7.513524817154191E-4,
-      3.3754195289163036E-4,
-      1.1448970904015772E-4,
-      2.7748062739107928E-5,
-      4.269518313561934E-6,
-      3.275851934317135E-7,
-      2.8380631280739243E-8
-    ]
-  },
-  "1.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.10141319123436285,
-      0.0744799719118942,
-      0.053302934392369446,
-      0.03710439722779914,
-      0.025233305504876683,
-      0.016611217264992647,
-      0.010874561205920681,
-      0.007089430131855757,
-      0.004735704192107324,
-      0.0032497241581103935,
-      0.00224633867348421,
-      0.0014926887341513958,
-      8.99402994300053E-4,
-      4.6495545871799336E-4,
-      1.9760638685189505E-4,
-      6.695871830384847E-5,
-      1.646229504584215E-5,
-      2.5310928452340686E-6,
-      1.5507654211137423E-7,
-      1.0398880318829333E-10
-    ]
-  },
-  "1.50 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.06748618059325431,
-      0.048969498174396456,
-      0.03459316809248189,
-      0.023688152870014776,
-      0.015827020121961646,
-      0.010291170526347024,
-      0.006757228489614272,
-      0.004499447563707923,
-      0.0030758254172137066,
-      0.0020950574930986474,
-      0.0013539309715865939,
-      7.845146305736257E-4,
-      3.87702571554377E-4,
-      1.5725735418832757E-4,
-      5.025824444146704E-5,
-      1.1916479718130206E-5,
-      1.6483615981943136E-6,
-      9.847704437760071E-8,
-      1.4633128404024892E-10,
-      3.159101166380461E-12
-    ]
-  },
-  "0.25 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.16662740391385814,
-      0.1285019807227121,
-      0.09585837418746834,
-      0.06974653277878162,
-      0.04921386715200056,
-      0.034304250571029024,
-      0.023511075277103017,
-      0.015841449679333493,
-      0.01057653399144754,
-      0.007064379772860579,
-      0.004804747845306701,
-      0.003347578800110431,
-      0.002345112473969661,
-      0.0015736239621749481,
-      9.427277375272904E-4,
-      4.6965743464877493E-4,
-      1.8566442358644718E-4,
-      5.5962371036384136E-5,
-      1.1714274262116314E-5,
-      1.3696979690319257E-6
-    ]
-  },
-  "0.30 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.16475450831524519,
-      0.12608932781106702,
-      0.09325701689554712,
-      0.06724715011048625,
-      0.047002638658945745,
-      0.032452151925708814,
-      0.022026447844136342,
-      0.014702583516066953,
-      0.009744474026204993,
-      0.006485466923759776,
-      0.004411186129437331,
-      0.003073038698810309,
-      0.002137348018037252,
-      0.0014047303433987457,
-      8.120313817734338E-4,
-      3.861840968370937E-4,
-      1.4481761169306506E-4,
-      4.102886199054623E-5,
-      7.857888414794718E-6,
-      7.193827386102664E-7
-    ]
-  },
-  "3.00 Second Spectral Acceleration": {
-    "xs": [
-      -6.214608098422191,
-      -5.809142990314028,
-      -5.405902577227974,
-      -4.999695354057922,
-      -4.595219855134923,
-      -4.186459851129906,
-      -3.780994743021742,
-      -3.3784578946926658,
-      -2.972015746936675,
-      -2.566550638828511,
-      -2.162823150618887,
-      -1.7544636844843582,
-      -1.3509272172825992,
-      -0.9441759353636907,
-      -0.5395680926316447,
-      -0.13353139262452263,
-      0.2700271372130602,
-      0.6780335427498971,
-      1.0818051703517284,
-      1.4883995840570443
-    ],
-    "ys": [
-      0.0366385880584287,
-      0.026505800276229518,
-      0.01856624924849421,
-      0.01255782116072572,
-      0.008342293462416961,
-      0.005521407850008796,
-      0.00371948469116279,
-      0.0025196166077128142,
-      0.0016370228449394766,
-      9.707402813567734E-4,
-      5.001070743272942E-4,
-      2.1212988174228856E-4,
-      7.287621092731275E-5,
-      1.874312101554649E-5,
-      3.1931913492919943E-6,
-      2.70853991084907E-7,
-      6.850768702204151E-9,
-      1.66912848253385E-11,
-      1.641928505276288E-12,
-      4.1668539477750565E-14
-    ]
-  },
-  "10.00 Second Spectral Acceleration": {
-    "xs": [
-      -8.00736806798383,
-      -7.602904462212756,
-      -7.196771574447054,
-      -6.794426593675134,
-      -6.383026750047155,
-      -5.979535976242708,
-      -5.575389259887802,
-      -5.169045030843898,
-      -4.764165917478549,
-      -4.358310108056566,
-      -3.952844999948401,
-      -3.547379891840237,
-      -3.1419147837320724,
-      -2.7364496756239083,
-      -2.3309845675157437,
-      -1.9241486572738007,
-      -1.5186835491656363,
-      -1.1147416705979933,
-      -0.709276562489829,
-      -0.30381145438166457
-    ],
-    "ys": [
-      0.0306457542414819,
-      0.02322337163703784,
-      0.01705908329845296,
-      0.012214961561651676,
-      0.008480157447572278,
-      0.005826165821528901,
-      0.003918366839129725,
-      0.002524615846673209,
-      0.0015110002365775507,
-      8.049225207104803E-4,
-      3.6893949721213804E-4,
-      1.4119722343865093E-4,
-      4.369527962380822E-5,
-      1.030309948628713E-5,
-      1.5871075389395406E-6,
-      1.1483912065013983E-7,
-      1.630810396212974E-9,
-      2.832893779557245E-11,
-      3.473817622685889E-12,
-      2.966762890444011E-13
-    ]
-  },
-  "0.40 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.15418300590895712,
-      0.11617063182694719,
-      0.08462891986254063,
-      0.060143487638303204,
-      0.04140768711225412,
-      0.02814423576591034,
-      0.0187918728765539,
-      0.012358543317248739,
-      0.008120546816416364,
-      0.005409152454709267,
-      0.0037045306270067193,
-      0.0025824026439098995,
-      0.0017589693448949438,
-      0.001097230632663273,
-      5.84959900729413E-4,
-      2.5162680100823535E-4,
-      8.403210914870828E-5,
-      2.05523387615256E-5,
-      3.0766136581080514E-6,
-      1.734105607713779E-7
-    ]
-  },
-  "0.15 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.16390703612480584,
-      0.1284662962890699,
-      0.09767288317111958,
-      0.07249261680274556,
-      0.052138987362276526,
-      0.03692419452462008,
-      0.025626229259046687,
-      0.017434564522863877,
-      0.011720499639040864,
-      0.00785296585720252,
-      0.0053320885575884654,
-      0.003698285388024423,
-      0.002590859429725693,
-      0.0017657621456978433,
-      0.0011005187529498695,
-      5.840943325373243E-4,
-      2.5010030820976745E-4,
-      8.242879816883924E-5,
-      1.9363558953852625E-5,
-      2.6777962133100654E-6
+      0.16740950916822125,
+      0.1301827371821187,
+      0.09802333688436565,
+      0.0720099099078939,
+      0.05129669394322607,
+      0.03606585232915037,
+      0.024916005816203585,
+      0.01691309964162624,
+      0.011363408680915814,
+      0.007619737320678117,
+      0.00518641999113049,
+      0.003611556059854821,
+      0.00253928053666354,
+      0.0017305585661145017,
+      0.0010724055561078664,
+      5.639609734298516E-4,
+      2.3956867451954393E-4,
+      7.882123713799232E-5,
+      1.8675841989591893E-5,
+      2.7011160805776843E-6
     ]
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2018-SAN_FRANCISCO_CA.json b/src/test/resources/e2e/nshm-conus-2018-SAN_FRANCISCO_CA.json
index cd6d8d963c22f58b593c43f35be77db2b7788598..58d03fa6115adc695ef0384b312b3d699b33aa5f 100644
--- a/src/test/resources/e2e/nshm-conus-2018-SAN_FRANCISCO_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2018-SAN_FRANCISCO_CA.json
@@ -1,278 +1,48 @@
 {
-  "0.03 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.5874664267513549,
-      0.44910761708368097,
-      0.334987472520144,
-      0.24546360579624393,
-      0.1754117806165705,
-      0.1241948607158113,
-      0.08625670051912523,
-      0.058026309416594396,
-      0.03737433447952097,
-      0.022659903474864813,
-      0.012729241490684143,
-      0.006433707952492048,
-      0.0027984934329231183,
-      9.898881251067756E-4,
-      2.6612006949023004E-4,
-      4.848244735131179E-5,
-      4.347529721535207E-6,
-      4.728229686375502E-8,
-      2.739183873993579E-10,
-      1.496549238718014E-16
-    ]
-  },
-  "0.10 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.7343933765390598,
-      0.5893442076818523,
-      0.4618300011747358,
-      0.355189421437632,
-      0.26607309688838154,
-      0.19678326149415087,
-      0.14305350710456677,
-      0.10188969360820291,
-      0.07076746076426844,
-      0.047246956097674916,
-      0.029953206593869172,
-      0.017750613489895466,
-      0.009624553004483831,
-      0.004627328271388666,
-      0.0018930669983491487,
-      6.249863917594182E-4,
-      1.5737332242052923E-4,
-      2.673590115966923E-5,
-      2.1192357513885537E-6,
-      2.6968566729609328E-8
-    ]
-  },
-  "0.50 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.7918767897889696,
-      0.6050704168083226,
-      0.44393439716624916,
-      0.3163299464550259,
-      0.21803859031851025,
-      0.1484525479391085,
-      0.09932382194138613,
-      0.06500588485393886,
-      0.04143201741375044,
-      0.02536717276883121,
-      0.0147544327472878,
-      0.00799555766758954,
-      0.003917409893942125,
-      0.0016683856029754526,
-      5.897016847281054E-4,
-      1.6291544590479868E-4,
-      3.225000932791446E-5,
-      3.52741728631186E-6,
-      1.1689831884701797E-7,
-      3.080103817640399E-10
-    ]
-  },
-  "0.01 Second Spectral Acceleration": {
-    "xs": [
-      -6.061887011404528,
-      -5.654992310486769,
-      -5.251433780649187,
-      -4.845968672541022,
-      -4.439655747510518,
-      -4.034190639402354,
-      -3.6306105459899607,
-      -3.223888366691745,
-      -2.8184232585835804,
-      -2.4123999590012524,
-      -2.0099154790312257,
-      -1.5994875815809322,
-      -1.1973282616072674,
-      -0.789658080940789,
-      -0.3856624808119846,
-      0.01980262729617973,
-      0.4252677354043441,
-      0.8329091229351039,
-      1.235471471385307,
-      1.6428726885203377
-    ],
-    "ys": [
-      0.7112106385860639,
-      0.5513831306660946,
-      0.41679499236354156,
-      0.3073371060796831,
-      0.22186281624942722,
-      0.15751843455278422,
-      0.11022072102257095,
-      0.0752126766540605,
-      0.049559719550134676,
-      0.030988140759669276,
-      0.018214824284155023,
-      0.0096891054474043,
-      0.004609266824655893,
-      0.0018146396851241072,
-      5.659451704903326E-4,
-      1.2751349994633024E-4,
-      1.757289393913999E-5,
-      8.938863247530345E-7,
-      2.8958026660652817E-9,
-      3.449954037560717E-13
-    ]
-  },
-  "7.50 Second Spectral Acceleration": {
-    "xs": [
-      -7.602904462212756,
-      -7.196771574447054,
-      -6.794426593675134,
-      -6.383026750047155,
-      -5.979535976242708,
-      -5.575389259887802,
-      -5.169045030843898,
-      -4.764165917478549,
-      -4.358310108056566,
-      -3.952844999948401,
-      -3.547379891840237,
-      -3.1419147837320724,
-      -2.7364496756239083,
-      -2.3309845675157437,
-      -1.9241486572738007,
-      -1.5186835491656363,
-      -1.1147416705979933,
-      -0.709276562489829,
-      -0.30381145438166457,
-      0.10436001532424286
-    ],
-    "ys": [
-      0.15626956725689511,
-      0.11406256056206573,
-      0.08273899214964026,
-      0.0590294027489879,
-      0.04184682115235774,
-      0.02912805647870452,
-      0.01980955970329024,
-      0.013177574307620028,
-      0.008496022366552348,
-      0.005229032799125042,
-      0.0029913257215224863,
-      0.0015450800767601055,
-      7.020846740487081E-4,
-      2.7392784982371995E-4,
-      8.8680332366542E-5,
-      2.3018941459612078E-5,
-      4.669090343065782E-6,
-      6.865525224257728E-7,
-      4.841307268333168E-8,
-      0.0
-    ]
-  },
-  "0.05 Second Spectral Acceleration": {
+  "1.00 Second Spectral Acceleration": {
     "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
     ],
     "ys": [
-      0.6262431425258409,
-      0.488352593023346,
-      0.37199085899518425,
-      0.27840003045506956,
-      0.2031716479444561,
-      0.14676873901395632,
-      0.10423258847228858,
-      0.072170893191904,
-      0.04826127669721645,
-      0.030656186981057154,
-      0.018254004658186086,
-      0.009979555668355277,
-      0.004851300490477157,
-      0.0020057641304098077,
-      6.684089674378488E-4,
-      1.6696916960050182E-4,
-      2.77687592010681E-5,
-      2.1501699986955555E-6,
-      2.021137546129714E-8,
-      1.0242961246522084E-10
+      0.5831008919911462,
+      0.42841990907067484,
+      0.3043299517318651,
+      0.20991504534178365,
+      0.14211631298661964,
+      0.09374868521078619,
+      0.061383844950437326,
+      0.039071093308164724,
+      0.024201671562405724,
+      0.014386438506911663,
+      0.008094350202773508,
+      0.004200420158829751,
+      0.0019393747258170354,
+      7.632975555052491E-4,
+      2.4394047425904366E-4,
+      5.965347779311546E-5,
+      8.782843961552907E-6,
+      4.938620973776963E-7,
+      8.239057057597381E-10,
+      5.0449196459382226E-12
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -299,120 +69,28 @@
       0.7929925155296614
     ],
     "ys": [
-      0.1576050989763439,
-      0.1124878500292107,
-      0.07947555735233697,
-      0.05560949901527652,
-      0.03824288440257084,
-      0.02585586600546616,
-      0.017051381378881385,
-      0.011010717462240343,
-      0.006875687986698826,
-      0.00403213020674032,
-      0.002153514691370932,
-      0.0010133002647834714,
-      4.039363811191867E-4,
-      1.357336294914964E-4,
-      3.507050379854809E-5,
-      6.763105267805672E-6,
-      8.407755639112459E-7,
-      4.9940708513107535E-8,
+      0.15758937503731724,
+      0.11247692685397598,
+      0.07946884297427433,
+      0.05560574371886311,
+      0.03824085383493094,
+      0.02585465059626231,
+      0.017050534628279733,
+      0.011010094459237604,
+      0.006875269673181764,
+      0.004031893488663088,
+      0.002153405881721278,
+      0.0010132607735766973,
+      4.039256174776689E-4,
+      1.3573151659263734E-4,
+      3.5070265791185964E-5,
+      6.763084787261478E-6,
+      8.40775820950977E-7,
+      4.9940703621115084E-8,
       0.0,
       0.0
     ]
   },
-  "Peak Ground Velocity": {
-    "xs": [
-      -1.439695137847006,
-      -1.0356374895067213,
-      -0.6311117896404926,
-      -0.22564668153232822,
-      0.17395330712343798,
-      0.5877866649021191,
-      0.9895411936137477,
-      1.3962446919730587,
-      1.801709800081223,
-      2.2071749081893874,
-      2.6100697927420065,
-      3.0204248861443626,
-      3.4242626545931514,
-      3.828641396489095,
-      4.23410650459726,
-      4.634728988229636,
-      5.043425116919247,
-      5.4510384535657,
-      5.855071922202427,
-      6.263398262591624
-    ],
-    "ys": [
-      0.6166105039611482,
-      0.4596794426047395,
-      0.33237959503032843,
-      0.23431338505700167,
-      0.16292392609191209,
-      0.11016069497767658,
-      0.07426990954205609,
-      0.04876660004696018,
-      0.031085857197624668,
-      0.019128260878327856,
-      0.011361057624491971,
-      0.006312384063902238,
-      0.0032092505634663056,
-      0.0013918720416739158,
-      4.833727019556064E-4,
-      1.2918452340619045E-4,
-      2.2943165554141434E-5,
-      2.185194489653112E-6,
-      6.696049685508079E-8,
-      3.247308100610492E-12
-    ]
-  },
-  "0.075 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.6824803988175645,
-      0.5423197997037432,
-      0.42114693130643277,
-      0.3212487643780465,
-      0.2388678590691923,
-      0.1755844084895045,
-      0.12693907132692936,
-      0.08982150387092966,
-      0.061797876926251376,
-      0.040710981432563804,
-      0.025362529767735495,
-      0.014693429355348566,
-      0.007727527701027788,
-      0.0035624802889587686,
-      0.001377102219545584,
-      4.219450257609995E-4,
-      9.597471107050006E-5,
-      1.382125899033688E-5,
-      8.182196044412212E-7,
-      7.154419313685222E-9
-    ]
-  },
   "Peak Ground Acceleration": {
     "xs": [
       -6.061887011404528,
@@ -437,72 +115,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.7094480930917539,
-      0.5498461630899619,
-      0.415520296020578,
-      0.3063185497949039,
-      0.22107295530950485,
-      0.15691978496000833,
-      0.10977191544223883,
-      0.07487607046648326,
-      0.04930757590646044,
-      0.030805159354617164,
-      0.01808897391797213,
-      0.009608960537392078,
-      0.00456220630575498,
-      0.0017909623852741632,
-      5.563822034892249E-4,
-      1.24697965748507E-4,
-      1.7017065935090595E-5,
-      8.486139108014413E-7,
-      2.7146496800067855E-9,
-      3.392483735943068E-13
-    ]
-  },
-  "2.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.2617428567949271,
-      0.18307491922429892,
-      0.12540890496745655,
-      0.08438898531578304,
-      0.05614876907130874,
-      0.03634071308588532,
-      0.023160833607317424,
-      0.014182818140794307,
-      0.008323278197168335,
-      0.004553606636660989,
-      0.002248821682374588,
-      9.617682600280767E-4,
-      3.410950566639449E-4,
-      9.511229144188657E-5,
-      1.8403715779671235E-5,
-      1.8469108315944092E-6,
-      3.7330794634755683E-8,
-      2.346008307830644E-12,
-      0.0,
-      0.0
+      0.7094470259373502,
+      0.5498428629048978,
+      0.41551231478349365,
+      0.3063031193282665,
+      0.22104888785899784,
+      0.15688910340717468,
+      0.10973948040239823,
+      0.0748473206499099,
+      0.04928602923975804,
+      0.030791659709764246,
+      0.018082373041434497,
+      0.009607207734429657,
+      0.004562768246986616,
+      0.0017919912792970505,
+      5.570645285749892E-4,
+      1.2499276983585092E-4,
+      1.7091062594602556E-5,
+      8.568799510008441E-7,
+      2.945707772219532E-9,
+      2.574987545635484E-12
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -529,532 +161,26 @@
       1.998773638612381
     ],
     "ys": [
-      0.8463438149470889,
-      0.6798295177290603,
-      0.5295787623732823,
-      0.40300084439038414,
-      0.29790373400558845,
-      0.21723251919255937,
-      0.1556470029291479,
-      0.10941059438055957,
-      0.07527935016265801,
-      0.05003104449092174,
-      0.03173361029445662,
-      0.018921844393866877,
-      0.01039879054053632,
-      0.005116393421625043,
-      0.0021684513788727345,
-      7.53285875726632E-4,
-      2.0411601106964467E-4,
-      3.9415676691233675E-5,
-      4.097186096977443E-6,
-      1.119973192769839E-7
-    ]
-  },
-  "0.75 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.7506790637132295,
-      0.5694311993678698,
-      0.41555312317750404,
-      0.29297967718627227,
-      0.20171354319530793,
-      0.13483788437759664,
-      0.08933619834353426,
-      0.05769880094827368,
-      0.036409667538268464,
-      0.022148924997112896,
-      0.012854994272857212,
-      0.0069887036166473996,
-      0.003454303565674522,
-      0.0014937200113821338,
-      5.401656764434319E-4,
-      1.5642692013820636E-4,
-      3.188981412070627E-5,
-      3.5496855023952804E-6,
-      1.0655943727827023E-7,
-      2.2624055223541888E-10
-    ]
-  },
-  "4.00 Second Spectral Acceleration": {
-    "xs": [
-      -6.622576336748475,
-      -6.214608098422191,
-      -5.809142990314028,
-      -5.405902577227974,
-      -4.999695354057922,
-      -4.595219855134923,
-      -4.186459851129906,
-      -3.780994743021742,
-      -3.3784578946926658,
-      -2.972015746936675,
-      -2.566550638828511,
-      -2.162823150618887,
-      -1.7544636844843582,
-      -1.3509272172825992,
-      -0.9441759353636907,
-      -0.5395680926316447,
-      -0.13353139262452263,
-      0.2700271372130602,
-      0.6780335427498971,
-      1.0818051703517284
-    ],
-    "ys": [
-      0.17181333662493845,
-      0.12136426359968452,
-      0.08477729568755976,
-      0.05863777186897628,
-      0.0398379608301589,
-      0.026584849699593897,
-      0.01726097395855934,
-      0.010934649640394038,
-      0.006665455903563833,
-      0.003776464864307184,
-      0.0019331747185304684,
-      8.644691786684666E-4,
-      3.211723157753879E-4,
-      9.7414400293834E-5,
-      2.1970193923022668E-5,
-      3.332604383034219E-6,
-      2.724783733972445E-7,
-      4.100820137840664E-9,
-      0.0,
-      0.0
-    ]
-  },
-  "0.02 Second Spectral Acceleration": {
-    "xs": [
-      -5.867478567326991,
-      -5.463192009738271,
-      -5.056155809398065,
-      -4.651214124489498,
-      -4.247495741716276,
-      -3.83970234384852,
-      -3.4357888264317746,
-      -3.03032371832361,
-      -2.624168717121508,
-      -2.2164073967529934,
-      -1.8140050781753747,
-      -1.40649706843741,
-      -1.0023934309275668,
-      -0.5960204698292225,
-      -0.19116050546115904,
-      0.2151113796169455,
-      0.62057648772511,
-      1.0260415958332743,
-      1.430311246536665,
-      1.8357763546448294
-    ],
-    "ys": [
-      0.6339469915755283,
-      0.4860531787201517,
-      0.3626487974055299,
-      0.2650895337426733,
-      0.19036550307717398,
-      0.1340677259150786,
-      0.09308757711020249,
-      0.06279486246486868,
-      0.04055171466184538,
-      0.02466478791325095,
-      0.014032449666672202,
-      0.0071594111905005,
-      0.003176854323677054,
-      0.001144649341725815,
-      3.158504940655961E-4,
-      5.985292647305548E-5,
-      5.8930071175594285E-6,
-      1.1439124004066776E-7,
-      3.6549521475131364E-10,
-      7.520003158489222E-16
-    ]
-  },
-  "1.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.5831141939184611,
-      0.4284395789131387,
-      0.3043543340463256,
-      0.20994093367925337,
-      0.14214018179947635,
-      0.09376769471795117,
-      0.061396879207838415,
-      0.039078516894684764,
-      0.024205136259459317,
-      0.014387749217808062,
-      0.008094783993421485,
-      0.004200597997309567,
-      0.001939476665595367,
-      7.633562210140222E-4,
-      2.439633419903811E-4,
-      5.9659786310055525E-5,
-      8.782866272053068E-6,
-      4.935213471497793E-7,
-      7.861567577088132E-10,
-      4.071044667800691E-12
-    ]
-  },
-  "1.50 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.3798264980654822,
-      0.2696315769563762,
-      0.18636981688303925,
-      0.1258950765629685,
-      0.08390003686599168,
-      0.05452818534414449,
-      0.035044254263427894,
-      0.02175318610368286,
-      0.01305763067557833,
-      0.007435904632192434,
-      0.003918681003931662,
-      0.0018428462753669582,
-      7.405821833608987E-4,
-      2.4278929095495447E-4,
-      6.060131465878878E-5,
-      9.712050578769322E-6,
-      5.92022881165477E-7,
-      4.0232253598505344E-10,
-      7.209834270890855E-13,
-      0.0
-    ]
-  },
-  "0.25 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.8667523753604536,
-      0.6914447940341649,
-      0.5330702128792767,
-      0.40048105880515905,
-      0.29176243910251176,
-      0.20962688792076822,
-      0.14797470330581367,
-      0.10244425427850296,
-      0.06938252472478453,
-      0.04533975749376277,
-      0.028237185068916808,
-      0.016500834984571888,
-      0.008857987137334369,
-      0.004235193013050365,
-      0.001733216633630624,
-      5.773978947401055E-4,
-      1.4892499168604064E-4,
-      2.679281156645027E-5,
-      2.4634777543180746E-6,
-      4.8287966706199225E-8
-    ]
-  },
-  "0.30 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.8720371105393914,
-      0.6905043685969291,
-      0.526883075949392,
-      0.3909879598227468,
-      0.2809491863399679,
-      0.1990485953819599,
-      0.13851718957922976,
-      0.09447907527404112,
-      0.06297811561958669,
-      0.0404501010602574,
-      0.02472561460741778,
-      0.014154532178859244,
-      0.007419007100936663,
-      0.003446164826546118,
-      0.0013617340988356633,
-      4.346861308941955E-4,
-      1.0622245154436943E-4,
-      1.755978781714779E-5,
-      1.37994979587149E-6,
-      9.820891720226562E-9
-    ]
-  },
-  "3.00 Second Spectral Acceleration": {
-    "xs": [
-      -6.214608098422191,
-      -5.809142990314028,
-      -5.405902577227974,
-      -4.999695354057922,
-      -4.595219855134923,
-      -4.186459851129906,
-      -3.780994743021742,
-      -3.3784578946926658,
-      -2.972015746936675,
-      -2.566550638828511,
-      -2.162823150618887,
-      -1.7544636844843582,
-      -1.3509272172825992,
-      -0.9441759353636907,
-      -0.5395680926316447,
-      -0.13353139262452263,
-      0.2700271372130602,
-      0.6780335427498971,
-      1.0818051703517284,
-      1.4883995840570443
-    ],
-    "ys": [
-      0.18105042283897144,
-      0.1266192618403775,
-      0.08732075710379067,
-      0.05922936436992873,
-      0.039601343080274576,
-      0.0258182658764627,
-      0.016452779723333102,
-      0.010160525366508721,
-      0.0059255253444252184,
-      0.0031926068689163865,
-      0.0015362687647735914,
-      6.265555006796032E-4,
-      2.1255058030478092E-4,
-      5.547291440600821E-5,
-      9.897866256758686E-6,
-      9.445062791304706E-7,
-      3.045663466445053E-8,
-      3.7809462552642207E-16,
-      0.0,
-      0.0
-    ]
-  },
-  "10.00 Second Spectral Acceleration": {
-    "xs": [
-      -8.00736806798383,
-      -7.602904462212756,
-      -7.196771574447054,
-      -6.794426593675134,
-      -6.383026750047155,
-      -5.979535976242708,
-      -5.575389259887802,
-      -5.169045030843898,
-      -4.764165917478549,
-      -4.358310108056566,
-      -3.952844999948401,
-      -3.547379891840237,
-      -3.1419147837320724,
-      -2.7364496756239083,
-      -2.3309845675157437,
-      -1.9241486572738007,
-      -1.5186835491656363,
-      -1.1147416705979933,
-      -0.709276562489829,
-      -0.30381145438166457
-    ],
-    "ys": [
-      0.1431142258743297,
-      0.10551791915655433,
-      0.07711423963568836,
-      0.056050067545237836,
-      0.03992600896807147,
-      0.02811979191927197,
-      0.01937371569399503,
-      0.012994828242320297,
-      0.008459681530380682,
-      0.005254171566973766,
-      0.003047892100019196,
-      0.0016077523782601327,
-      7.522602988567233E-4,
-      3.045933970167802E-4,
-      1.0354890322852094E-4,
-      2.7949705365621346E-5,
-      5.576155578509019E-6,
-      7.787984905939597E-7,
-      5.513132044155439E-8,
-      0.0
-    ]
-  },
-  "0.40 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.8449496493673989,
-      0.6566830015171748,
-      0.4902994698362092,
-      0.35545597060484824,
-      0.2492769668127173,
-      0.17252447098346607,
-      0.11734097833243413,
-      0.0781795503599614,
-      0.05082460479397362,
-      0.03178404032748908,
-      0.018899434981548984,
-      0.010501546982769597,
-      0.005309420147243573,
-      0.0023535945225331787,
-      8.748396385587149E-4,
-      2.577799891951781E-4,
-      5.63616146177529E-5,
-      7.609302920539813E-6,
-      4.0288582674875185E-7,
-      1.132457598014124E-9
-    ]
-  },
-  "0.15 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.804373880632884,
-      0.6489307114395929,
-      0.5097072286697952,
-      0.39215037394771884,
-      0.293525235347327,
-      0.21672042914002299,
-      0.15718597006397714,
-      0.11179691011049485,
-      0.07775786760433187,
-      0.052200661005116514,
-      0.0334281951840581,
-      0.02011980262047941,
-      0.01116386639944797,
-      0.005550476657540096,
-      0.0023796641651041874,
-      8.365945255931144E-4,
-      2.2926744587109356E-4,
-      4.4529614261364314E-5,
-      4.533120501059825E-6,
-      1.0308133635300197E-7
+      0.8463434568144551,
+      0.6798282480043856,
+      0.529575106126662,
+      0.4029924331123037,
+      0.2978878788706715,
+      0.21720849261933428,
+      0.15561695133652084,
+      0.10937917498336788,
+      0.07525155479744264,
+      0.050010085179069824,
+      0.031720239807918466,
+      0.018914948303394893,
+      0.010396290099441213,
+      0.005116134863810128,
+      0.002168905715322163,
+      7.537255830739884E-4,
+      2.043519900756787E-4,
+      3.950315353965147E-5,
+      4.114149996331726E-6,
+      1.1332666265240457E-7
     ]
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2018-SEATTLE_WA.json b/src/test/resources/e2e/nshm-conus-2018-SEATTLE_WA.json
index cea542cc8ef5ce7fa9b0aa64d22e6aa65abb7249..41b81561aff8544508dcfd1a4b534b4ad17845ca 100644
--- a/src/test/resources/e2e/nshm-conus-2018-SEATTLE_WA.json
+++ b/src/test/resources/e2e/nshm-conus-2018-SEATTLE_WA.json
@@ -1,278 +1,48 @@
 {
-  "0.03 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.22480651028104304,
-      0.19239213965175658,
-      0.15936161594623185,
-      0.1275146356905474,
-      0.0973137926118801,
-      0.07129545306185185,
-      0.04970572686098274,
-      0.03283102468551178,
-      0.02054174682001113,
-      0.012042040532254777,
-      0.006533109856809289,
-      0.0032195542491221672,
-      0.0014095843915094693,
-      5.317026418447738E-4,
-      1.6497371933490185E-4,
-      3.9019360406358925E-5,
-      6.218647708560865E-6,
-      5.763621784268041E-7,
-      2.2098186964357268E-8,
-      9.051226675233101E-11
-    ]
-  },
-  "0.10 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.2568806164026477,
-      0.22941413948510794,
-      0.2002601164612022,
-      0.17049411234935827,
-      0.14009264899300639,
-      0.11142724450841429,
-      0.08503273518189389,
-      0.061888181373395065,
-      0.04291676150063565,
-      0.02818855523578149,
-      0.017457119914654227,
-      0.01009253311477831,
-      0.005373992295222127,
-      0.0025905718214608033,
-      0.0011056539546966842,
-      4.034652989901638E-4,
-      1.2110776546571552E-4,
-      2.7828449529181933E-5,
-      4.164261342166884E-6,
-      3.296446137841925E-7
-    ]
-  },
-  "0.50 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.2471438826018434,
-      0.20813077145535122,
-      0.1683585652489323,
-      0.1308236208435139,
-      0.0965768499975588,
-      0.06853196632144383,
-      0.04652071066253286,
-      0.03021223521530319,
-      0.01883616262941148,
-      0.011160046088264878,
-      0.006193663602375905,
-      0.0031520943334687923,
-      0.0014431456672169257,
-      5.844440345466739E-4,
-      2.0522954132580972E-4,
-      6.041076835121371E-5,
-      1.4464768476903563E-5,
-      2.6947718722165783E-6,
-      3.415463363239798E-7,
-      2.0949996703005372E-8
-    ]
-  },
-  "0.01 Second Spectral Acceleration": {
-    "xs": [
-      -6.061887011404528,
-      -5.654992310486769,
-      -5.251433780649187,
-      -4.845968672541022,
-      -4.439655747510518,
-      -4.034190639402354,
-      -3.6306105459899607,
-      -3.223888366691745,
-      -2.8184232585835804,
-      -2.4123999590012524,
-      -2.0099154790312257,
-      -1.5994875815809322,
-      -1.1973282616072674,
-      -0.789658080940789,
-      -0.3856624808119846,
-      0.01980262729617973,
-      0.4252677354043441,
-      0.8329091229351039,
-      1.235471471385307,
-      1.6428726885203377
-    ],
-    "ys": [
-      0.24799852934846736,
-      0.21551256201501431,
-      0.1818791411745768,
-      0.14804165755603535,
-      0.11565481164508576,
-      0.08639571879314224,
-      0.061558806307629776,
-      0.0415704362523262,
-      0.026675437566811858,
-      0.016161014029639247,
-      0.009191155316601293,
-      0.0047368353346616664,
-      0.002222784598033622,
-      9.009139506583668E-4,
-      3.091541410913309E-4,
-      8.363812131217344E-5,
-      1.622101415997888E-5,
-      1.8494925110963734E-6,
-      1.1132226275596804E-7,
-      6.837052792698252E-10
-    ]
-  },
-  "7.50 Second Spectral Acceleration": {
-    "xs": [
-      -7.602904462212756,
-      -7.196771574447054,
-      -6.794426593675134,
-      -6.383026750047155,
-      -5.979535976242708,
-      -5.575389259887802,
-      -5.169045030843898,
-      -4.764165917478549,
-      -4.358310108056566,
-      -3.952844999948401,
-      -3.547379891840237,
-      -3.1419147837320724,
-      -2.7364496756239083,
-      -2.3309845675157437,
-      -1.9241486572738007,
-      -1.5186835491656363,
-      -1.1147416705979933,
-      -0.709276562489829,
-      -0.30381145438166457,
-      0.10436001532424286
-    ],
-    "ys": [
-      0.057504529293937734,
-      0.042078602339345905,
-      0.029972891939920334,
-      0.020475167418084517,
-      0.013629020320962337,
-      0.008819923728116954,
-      0.005587368819595242,
-      0.003499981489472991,
-      0.0021552370084213577,
-      0.0012900811848004417,
-      7.362567899579544E-4,
-      3.913461347331755E-4,
-      1.8794742254125838E-4,
-      7.893346064599808E-5,
-      2.8013379963329657E-5,
-      7.998307564706138E-6,
-      1.497029172981033E-6,
-      1.0872868096130695E-7,
-      1.2795481251601001E-12,
-      0.0
-    ]
-  },
-  "0.05 Second Spectral Acceleration": {
+  "1.00 Second Spectral Acceleration": {
     "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
     ],
     "ys": [
-      0.23450870647710428,
-      0.20410882400353036,
-      0.17258722970364956,
-      0.14146348059944086,
-      0.11105316898477842,
-      0.08390454344632978,
-      0.06044877068925625,
-      0.041301981215679504,
-      0.026754513523002017,
-      0.016296425769353994,
-      0.009256084359059698,
-      0.0048326313596572705,
-      0.0022809715756480936,
-      9.532992884979415E-4,
-      3.417223093679745E-4,
-      9.987475759032554E-5,
-      2.2288216948993927E-5,
-      3.382070225996897E-6,
-      3.064983960378735E-7,
-      9.890335300782297E-9
+      0.18974076470885134,
+      0.15035830376044865,
+      0.11450746101346057,
+      0.08372212205176174,
+      0.059056934947110895,
+      0.03979043310491079,
+      0.026081869849010786,
+      0.016390117898980403,
+      0.009939769054053986,
+      0.005732292609750041,
+      0.0030911152295593296,
+      0.001523977515088581,
+      6.709168676869215E-4,
+      2.574847007089419E-4,
+      8.378741714505465E-5,
+      2.251661394806186E-5,
+      4.500727576177569E-6,
+      6.144243207535919E-7,
+      4.524870395276403E-8,
+      4.3303919732436456E-10
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -299,120 +69,28 @@
       0.7929925155296614
     ],
     "ys": [
-      0.05798410239321793,
-      0.04190469135307654,
-      0.029366591251134604,
-      0.019925555867050533,
-      0.01305936133854125,
-      0.008356621159538311,
-      0.00521917319590902,
-      0.0032088283451382014,
-      0.0019199478710129063,
-      0.0010855280596044794,
-      5.619299089021622E-4,
-      2.56329486597956E-4,
-      9.795996789390538E-5,
-      3.0940301481857225E-5,
-      7.1649388581560175E-6,
-      9.92806997968112E-7,
-      3.042005999895275E-8,
+      0.05798340020697013,
+      0.04190422736247452,
+      0.029366243206519944,
+      0.019925269776090763,
+      0.013059136945793099,
+      0.008356470042035316,
+      0.005219092927938535,
+      0.003208797581193821,
+      0.0019199405263871357,
+      0.0010855264302525767,
+      5.619278902374833E-4,
+      2.56327084563797E-4,
+      9.795826467321656E-5,
+      3.093950684856507E-5,
+      7.164683336505891E-6,
+      9.927613969917701E-7,
+      3.041624502650113E-8,
       2.0591305604095127E-11,
       0.0,
       0.0
     ]
   },
-  "Peak Ground Velocity": {
-    "xs": [
-      -1.439695137847006,
-      -1.0356374895067213,
-      -0.6311117896404926,
-      -0.22564668153232822,
-      0.17395330712343798,
-      0.5877866649021191,
-      0.9895411936137477,
-      1.3962446919730587,
-      1.801709800081223,
-      2.2071749081893874,
-      2.6100697927420065,
-      3.0204248861443626,
-      3.4242626545931514,
-      3.828641396489095,
-      4.23410650459726,
-      4.634728988229636,
-      5.043425116919247,
-      5.4510384535657,
-      5.855071922202427,
-      6.263398262591624
-    ],
-    "ys": [
-      0.2028607537451583,
-      0.1633255191943226,
-      0.1261481022630101,
-      0.09329430777381705,
-      0.0664135625918681,
-      0.044630482520522374,
-      0.0289693545959238,
-      0.01781176417096935,
-      0.010408304589811353,
-      0.0057410416669272275,
-      0.0029908883247628925,
-      0.0014460864241109062,
-      6.601037382163808E-4,
-      2.735853885963977E-4,
-      9.829827991645202E-5,
-      2.9088571508796664E-5,
-      6.305687119241706E-6,
-      8.931813934401446E-7,
-      6.172852364792175E-8,
-      1.6143030160500196E-10
-    ]
-  },
-  "0.075 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.2470006504115053,
-      0.21855759393225324,
-      0.1885949071080644,
-      0.15833320315583999,
-      0.12788513668563115,
-      0.09972416031701099,
-      0.07439435574983991,
-      0.052785183542787016,
-      0.03560249223982468,
-      0.02268105247926461,
-      0.013571309797850135,
-      0.0075391128583122075,
-      0.0038316709497869727,
-      0.0017498234330187944,
-      7.010495148850692E-4,
-      2.3668685178607958E-4,
-      6.441650983362485E-5,
-      1.3001121693676923E-5,
-      1.6849770949433432E-6,
-      1.1934795910193425E-7
-    ]
-  },
   "Peak Ground Acceleration": {
     "xs": [
       -6.061887011404528,
@@ -437,72 +115,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.24771905048343434,
-      0.21523713496170038,
-      0.1816191521395854,
-      0.1478075554054198,
-      0.1154544339012026,
-      0.08623301622609748,
-      0.061433805356339334,
-      0.0414804231846681,
-      0.026614632328006187,
-      0.01612216950304512,
-      0.009167194434595047,
-      0.004722697334116728,
-      0.002214597550359615,
-      8.963960191205455E-4,
-      3.069001199656579E-4,
-      8.27255518898778E-5,
-      1.5948275589964146E-5,
-      1.7970761841398694E-6,
-      1.0698108241721651E-7,
-      6.68061228742313E-10
-    ]
-  },
-  "2.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.09343882934369653,
-      0.06831467744132845,
-      0.04836599671028517,
-      0.03305222437430684,
-      0.021885189390084606,
-      0.013868455884344483,
-      0.008595222626360281,
-      0.005121867328830792,
-      0.002943964788710784,
-      0.001590060059262415,
-      7.805103423263818E-4,
-      3.346768899977019E-4,
-      1.2069263245088336E-4,
-      3.491647081622185E-5,
-      7.334401680147769E-6,
-      9.532314177705859E-7,
-      4.1995803977995306E-8,
-      3.023121341224169E-10,
-      0.0,
-      0.0
+      0.24771893073100731,
+      0.21523675831978528,
+      0.18161823545206088,
+      0.14780579912486952,
+      0.11545178046324324,
+      0.08622984829356381,
+      0.06143083406558189,
+      0.041478320268564024,
+      0.026613647854233174,
+      0.016122062113439015,
+      0.00916745923846515,
+      0.004722903809421655,
+      0.002214599541925819,
+      8.96285507746999E-4,
+      3.0679993472347236E-4,
+      8.267322515716905E-5,
+      1.5932119722315774E-5,
+      1.7946631531444621E-6,
+      1.06895828117477E-7,
+      6.68125464781831E-10
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -529,532 +161,26 @@
       1.998773638612381
     ],
     "ys": [
-      0.27215751663160787,
-      0.2428176195154961,
-      0.21114125797694014,
-      0.17854851128367305,
-      0.14528024526142022,
-      0.11415412015323895,
-      0.08588170582380726,
-      0.06155130741010543,
-      0.042061104550971846,
-      0.027300770034069673,
-      0.01678092950211344,
-      0.00966862769083664,
-      0.005145022075262219,
-      0.0024839610004631345,
-      0.0010642592270944404,
-      3.910919996117647E-4,
-      1.188789644676158E-4,
-      2.8095309711551694E-5,
-      4.565778765784684E-6,
-      4.733053483090387E-7
-    ]
-  },
-  "0.75 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.231493157433031,
-      0.19117414599371751,
-      0.1516562484295518,
-      0.11523124691775388,
-      0.08409696246314179,
-      0.05838110346074373,
-      0.039236968437381926,
-      0.025222168078896927,
-      0.015642674029835695,
-      0.009256809936784387,
-      0.00515211927104197,
-      0.0026410615093262523,
-      0.0012213505398259606,
-      5.003390573218645E-4,
-      1.7808456629794738E-4,
-      5.424163397991038E-5,
-      1.325925674342787E-5,
-      2.50657884109865E-6,
-      3.1085581381543864E-7,
-      1.7279514060356802E-8
-    ]
-  },
-  "4.00 Second Spectral Acceleration": {
-    "xs": [
-      -6.622576336748475,
-      -6.214608098422191,
-      -5.809142990314028,
-      -5.405902577227974,
-      -4.999695354057922,
-      -4.595219855134923,
-      -4.186459851129906,
-      -3.780994743021742,
-      -3.3784578946926658,
-      -2.972015746936675,
-      -2.566550638828511,
-      -2.162823150618887,
-      -1.7544636844843582,
-      -1.3509272172825992,
-      -0.9441759353636907,
-      -0.5395680926316447,
-      -0.13353139262452263,
-      0.2700271372130602,
-      0.6780335427498971,
-      1.0818051703517284
-    ],
-    "ys": [
-      0.06278160697312478,
-      0.045380173995250635,
-      0.03184335333951203,
-      0.021644304809397212,
-      0.014192534170634825,
-      0.00906531573168108,
-      0.005639218635491853,
-      0.0034526893386517344,
-      0.0020557987593461686,
-      0.0011429188425061338,
-      5.702294947794385E-4,
-      2.4375116624853648E-4,
-      8.354822670591189E-5,
-      2.1995030654630302E-5,
-      3.7015723564902275E-6,
-      2.689044025111518E-7,
-      2.140676847379157E-9,
-      7.7912821225978E-12,
-      0.0,
-      0.0
-    ]
-  },
-  "0.02 Second Spectral Acceleration": {
-    "xs": [
-      -5.867478567326991,
-      -5.463192009738271,
-      -5.056155809398065,
-      -4.651214124489498,
-      -4.247495741716276,
-      -3.83970234384852,
-      -3.4357888264317746,
-      -3.03032371832361,
-      -2.624168717121508,
-      -2.2164073967529934,
-      -1.8140050781753747,
-      -1.40649706843741,
-      -1.0023934309275668,
-      -0.5960204698292225,
-      -0.19116050546115904,
-      0.2151113796169455,
-      0.62057648772511,
-      1.0260415958332743,
-      1.430311246536665,
-      1.8357763546448294
-    ],
-    "ys": [
-      0.2334477387148552,
-      0.20064470317230232,
-      0.16683272195695692,
-      0.13384506820907976,
-      0.1031103458154699,
-      0.07564137003417533,
-      0.05298255241437446,
-      0.03520818216227835,
-      0.02214618059488552,
-      0.013069150990199287,
-      0.007207917190559712,
-      0.0035898666970925097,
-      0.0015999745746389077,
-      6.116637592378052E-4,
-      1.931406339392069E-4,
-      4.6492092112155395E-5,
-      7.5367073535871345E-6,
-      6.831647764714132E-7,
-      2.7029159193395804E-8,
-      1.195170693804542E-10
-    ]
-  },
-  "1.00 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.18974220852733042,
-      0.1503603205866619,
-      0.11450972580818455,
-      0.08372418685542979,
-      0.05905848080560045,
-      0.03979138599535944,
-      0.02608238717616988,
-      0.016390386446054735,
-      0.00993991853959655,
-      0.00573237506119225,
-      0.0030911516260269632,
-      0.0015239923456548826,
-      6.709274996732437E-4,
-      2.5749473831085276E-4,
-      8.379549697881683E-5,
-      2.2520975467410156E-5,
-      4.5025336547816115E-6,
-      6.148680274504022E-7,
-      4.5290379083310874E-8,
-      4.3393158533330896E-10
-    ]
-  },
-  "1.50 Second Spectral Acceleration": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.13010322420717485,
-      0.09774937668917924,
-      0.07095088037187179,
-      0.04968084211602096,
-      0.03369049102860196,
-      0.02185259955170779,
-      0.0138252012592269,
-      0.00839274747369069,
-      0.0049180302592913,
-      0.002731153820233079,
-      0.0014046779113826764,
-      6.479254052530189E-4,
-      2.5903440642187527E-4,
-      8.669531806540833E-5,
-      2.3076911477014454E-5,
-      4.518420238862625E-6,
-      5.125345516782854E-7,
-      2.6664807502367415E-8,
-      1.404532865825582E-10,
-      0.0
-    ]
-  },
-  "0.25 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.2731348990836976,
-      0.24193925177772677,
-      0.2082278451291889,
-      0.17375973898185781,
-      0.1390364716951082,
-      0.10716870140065486,
-      0.07892311191030409,
-      0.055307387005574415,
-      0.03696517106802987,
-      0.023479151429935438,
-      0.01411341420878641,
-      0.007927937269192982,
-      0.004093254724557879,
-      0.001906933011057834,
-      7.835566935634464E-4,
-      2.742422900302934E-4,
-      7.880824043736091E-5,
-      1.7451156641891006E-5,
-      2.7058923472430033E-6,
-      2.7069532487264303E-7
-    ]
-  },
-  "0.30 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.2712948182013472,
-      0.23815777597430776,
-      0.2025017289715342,
-      0.1664782639960936,
-      0.13084900834140148,
-      0.09890996899579609,
-      0.07136492802077093,
-      0.049012434252250915,
-      0.032154757583545024,
-      0.020072584373654105,
-      0.011850167689385573,
-      0.006516086260400743,
-      0.003276877176875276,
-      0.0014783228273676985,
-      5.848780839998348E-4,
-      1.9601565396114732E-4,
-      5.361777932084624E-5,
-      1.1249723523864489E-5,
-      1.6953113859959098E-6,
-      1.5765383157033432E-7
-    ]
-  },
-  "3.00 Second Spectral Acceleration": {
-    "xs": [
-      -6.214608098422191,
-      -5.809142990314028,
-      -5.405902577227974,
-      -4.999695354057922,
-      -4.595219855134923,
-      -4.186459851129906,
-      -3.780994743021742,
-      -3.3784578946926658,
-      -2.972015746936675,
-      -2.566550638828511,
-      -2.162823150618887,
-      -1.7544636844843582,
-      -1.3509272172825992,
-      -0.9441759353636907,
-      -0.5395680926316447,
-      -0.13353139262452263,
-      0.2700271372130602,
-      0.6780335427498971,
-      1.0818051703517284,
-      1.4883995840570443
-    ],
-    "ys": [
-      0.06635933035488639,
-      0.04775415100316292,
-      0.03332565943501348,
-      0.022399060992056043,
-      0.014572640864448087,
-      0.009148984325560012,
-      0.00561584201154959,
-      0.0033698808345375393,
-      0.0019326895227601026,
-      0.0010318856104184382,
-      4.913644694604386E-4,
-      1.9661264543265769E-4,
-      6.445087337293315E-5,
-      1.5632153967228722E-5,
-      2.402911803157896E-6,
-      1.3152321308340758E-7,
-      1.6621628256228205E-9,
-      1.211146049486106E-12,
-      0.0,
-      0.0
-    ]
-  },
-  "10.00 Second Spectral Acceleration": {
-    "xs": [
-      -8.00736806798383,
-      -7.602904462212756,
-      -7.196771574447054,
-      -6.794426593675134,
-      -6.383026750047155,
-      -5.979535976242708,
-      -5.575389259887802,
-      -5.169045030843898,
-      -4.764165917478549,
-      -4.358310108056566,
-      -3.952844999948401,
-      -3.547379891840237,
-      -3.1419147837320724,
-      -2.7364496756239083,
-      -2.3309845675157437,
-      -1.9241486572738007,
-      -1.5186835491656363,
-      -1.1147416705979933,
-      -0.709276562489829,
-      -0.30381145438166457
-    ],
-    "ys": [
-      0.05540888181431856,
-      0.040760633141302724,
-      0.029082055642471606,
-      0.02015269716198301,
-      0.013395422595272446,
-      0.008728770142290615,
-      0.005581814786364838,
-      0.0035274137896951405,
-      0.0022168478274693796,
-      0.0013737650548175328,
-      8.322983874318696E-4,
-      4.857777973535088E-4,
-      2.66948403700292E-4,
-      1.3413877292532136E-4,
-      5.9832802937100474E-5,
-      2.2899367508999174E-5,
-      7.1235722754808235E-6,
-      1.5094629793633278E-6,
-      1.334966024075107E-7,
-      0.0
-    ]
-  },
-  "0.40 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.2619282578425073,
-      0.22541978422012118,
-      0.1870354159140281,
-      0.14947528756900172,
-      0.11376263221469764,
-      0.08317487739659245,
-      0.05806214030852909,
-      0.038669434259940606,
-      0.0246787792265342,
-      0.014994644195204012,
-      0.008582357112278692,
-      0.004539986766098562,
-      0.002176286878178783,
-      9.276057061899081E-4,
-      3.439499229879172E-4,
-      1.0711846061547824E-4,
-      2.6997185946736625E-5,
-      5.208683895054006E-6,
-      7.191523381605899E-7,
-      5.2933454931882164E-8
-    ]
-  },
-  "0.15 Second Spectral Acceleration": {
-    "xs": [
-      -5.704782974989785,
-      -5.30031936921871,
-      -4.8941864814530085,
-      -4.491841500681089,
-      -4.080441657053109,
-      -3.6769508832486624,
-      -3.2728041668937564,
-      -2.866459937849852,
-      -2.4615808244845034,
-      -2.05572501506252,
-      -1.6502599069543555,
-      -1.2447947988461912,
-      -0.8393296907380268,
-      -0.4338645826298623,
-      -0.028399474521698,
-      0.37843643572024505,
-      0.7839015438284094,
-      1.1878434223960523,
-      1.5933085305042167,
-      1.998773638612381
-    ],
-    "ys": [
-      0.26723710770538406,
-      0.23929180461729455,
-      0.20928480375012712,
-      0.17840585107027152,
-      0.1467102200187023,
-      0.11674028164476564,
-      0.08910879053344965,
-      0.06487556801393521,
-      0.04503350048352529,
-      0.029663602734976056,
-      0.018484427633167662,
-      0.010799862420030816,
-      0.005839681043630296,
-      0.0028737893179784308,
-      0.0012600510026043817,
-      4.7624921427815765E-4,
-      1.496459853498727E-4,
-      3.6715831242888544E-5,
-      6.1478327952108395E-6,
-      5.903741740555818E-7
+      0.2721574775049231,
+      0.24281747770364934,
+      0.2111408438434728,
+      0.17854755388890456,
+      0.14527845924323876,
+      0.11415150096067693,
+      0.08587864028445241,
+      0.06154846143598557,
+      0.04205905133610497,
+      0.02729969817831103,
+      0.0167806308316971,
+      0.009668716593145835,
+      0.005145168068999916,
+      0.002484010179931396,
+      0.0010642217291543983,
+      3.9103358452733316E-4,
+      1.1883832643066001E-4,
+      2.807665802756398E-5,
+      4.561137287716157E-6,
+      4.7281340794708457E-7
     ]
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-hawaii-2021-HILO_HI.json b/src/test/resources/e2e/nshm-hawaii-2021-HILO_HI.json
new file mode 100644
index 0000000000000000000000000000000000000000..fdea57eff1b04bda66bf1df78cef4e0ff57d9096
--- /dev/null
+++ b/src/test/resources/e2e/nshm-hawaii-2021-HILO_HI.json
@@ -0,0 +1,186 @@
+{
+  "1.00 Second Spectral Acceleration": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      1.1394279599298858,
+      0.909645925740205,
+      0.6810439562313704,
+      0.48213438998284386,
+      0.3270662494936988,
+      0.2122733790095776,
+      0.13579352589768764,
+      0.08466990088453302,
+      0.051479667241025914,
+      0.029592215233161495,
+      0.015605186053687877,
+      0.007369438722986228,
+      0.003079134500128523,
+      0.001133816052813239,
+      3.683841726832001E-4,
+      1.0771529770871671E-4,
+      2.7590429340726256E-5,
+      6.106383784135074E-6,
+      9.141545957726994E-7,
+      4.716658318737339E-8
+    ]
+  },
+  "5.00 Second Spectral Acceleration": {
+    "xs": [
+      -6.908755779315721,
+      -6.502290170873972,
+      -6.0968250627658085,
+      -5.692842534617867,
+      -5.286388795682763,
+      -4.882242079327857,
+      -4.474141923581687,
+      -4.0686768154735224,
+      -3.6651629274966204,
+      -3.259697819388456,
+      -2.8542327112802917,
+      -2.448767603172127,
+      -2.0402208285265546,
+      -1.6398971199188088,
+      -1.2310014767138553,
+      -0.8278220838865469,
+      -0.42159449003804794,
+      -0.016129381929883644,
+      0.3920420877760237,
+      0.7929925155296614
+    ],
+    "ys": [
+      0.24225805041057027,
+      0.1626494298061276,
+      0.11286823232748022,
+      0.08019936527365806,
+      0.057001082377164766,
+      0.039772310464229216,
+      0.026270923994779784,
+      0.0159300182060438,
+      0.008586807484419113,
+      0.0040091692633346795,
+      0.0016237229130359047,
+      5.831580842583807E-4,
+      1.935491083341371E-4,
+      6.446411351755592E-5,
+      2.0541404464536928E-5,
+      5.89324452995356E-6,
+      1.3026715401568408E-6,
+      2.061368668443604E-7,
+      2.231361292849435E-8,
+      3.427414499140028E-10
+    ]
+  },
+  "Peak Ground Acceleration": {
+    "xs": [
+      -6.061887011404528,
+      -5.654992310486769,
+      -5.251433780649187,
+      -4.845968672541022,
+      -4.439655747510518,
+      -4.034190639402354,
+      -3.6306105459899607,
+      -3.223888366691745,
+      -2.8184232585835804,
+      -2.4123999590012524,
+      -2.0099154790312257,
+      -1.5994875815809322,
+      -1.1973282616072674,
+      -0.789658080940789,
+      -0.3856624808119846,
+      0.01980262729617973,
+      0.4252677354043441,
+      0.8329091229351039,
+      1.235471471385307,
+      1.6428726885203377
+    ],
+    "ys": [
+      1.367163786511996,
+      1.2691006652906478,
+      1.1637737587135957,
+      1.0330746473392465,
+      0.868541087272583,
+      0.6793538859833672,
+      0.48957767668206337,
+      0.32305214036758084,
+      0.19728774899189122,
+      0.11230291486323442,
+      0.05999879240178362,
+      0.02903842762547559,
+      0.012752442114810743,
+      0.004825259624029285,
+      0.0015856433122290359,
+      4.467361996202859E-4,
+      1.0815891326044897E-4,
+      2.1501975995084007E-5,
+      3.0877820264321665E-6,
+      2.0121735347546392E-7
+    ]
+  },
+  "0.20 Second Spectral Acceleration": {
+    "xs": [
+      -5.704782974989785,
+      -5.30031936921871,
+      -4.8941864814530085,
+      -4.491841500681089,
+      -4.080441657053109,
+      -3.6769508832486624,
+      -3.2728041668937564,
+      -2.866459937849852,
+      -2.4615808244845034,
+      -2.05572501506252,
+      -1.6502599069543555,
+      -1.2447947988461912,
+      -0.8393296907380268,
+      -0.4338645826298623,
+      -0.028399474521698,
+      0.37843643572024505,
+      0.7839015438284094,
+      1.1878434223960523,
+      1.5933085305042167,
+      1.998773638612381
+    ],
+    "ys": [
+      1.4371068709113273,
+      1.3442294606163505,
+      1.2504550788598903,
+      1.145108478540398,
+      1.0076845134906756,
+      0.8393355383077514,
+      0.6496537972367906,
+      0.4625305796292689,
+      0.30353482643208957,
+      0.18409848770017573,
+      0.10404729414822564,
+      0.05492082710147257,
+      0.026929508320917738,
+      0.012117250742785222,
+      0.0049122319794404614,
+      0.0017509584506394304,
+      5.433850247572385E-4,
+      1.4341185451814312E-4,
+      3.1018961899754435E-5,
+      5.1396679710212166E-6
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-hawaii-2021-HONOLULU_HI.json b/src/test/resources/e2e/nshm-hawaii-2021-HONOLULU_HI.json
new file mode 100644
index 0000000000000000000000000000000000000000..5e230f1e6f2c42a17bcfbf34e73f4bf455555cbe
--- /dev/null
+++ b/src/test/resources/e2e/nshm-hawaii-2021-HONOLULU_HI.json
@@ -0,0 +1,186 @@
+{
+  "1.00 Second Spectral Acceleration": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      0.1096176362431887,
+      0.07712267985209978,
+      0.05236216472551226,
+      0.03410083982464372,
+      0.021327885700315224,
+      0.012597455865731777,
+      0.007195466062794852,
+      0.0039020156778838797,
+      0.0020347763827356416,
+      0.0010104978512827578,
+      4.744665345271375E-4,
+      2.0784677016393618E-4,
+      8.354936782969439E-5,
+      3.0262362405560818E-5,
+      9.700628718654082E-6,
+      2.73388661760168E-6,
+      6.418080520161567E-7,
+      1.2432205810419981E-7,
+      1.6644800833465068E-8,
+      8.894088492362762E-10
+    ]
+  },
+  "5.00 Second Spectral Acceleration": {
+    "xs": [
+      -6.908755779315721,
+      -6.502290170873972,
+      -6.0968250627658085,
+      -5.692842534617867,
+      -5.286388795682763,
+      -4.882242079327857,
+      -4.474141923581687,
+      -4.0686768154735224,
+      -3.6651629274966204,
+      -3.259697819388456,
+      -2.8542327112802917,
+      -2.448767603172127,
+      -2.0402208285265546,
+      -1.6398971199188088,
+      -1.2310014767138553,
+      -0.8278220838865469,
+      -0.42159449003804794,
+      -0.016129381929883644,
+      0.3920420877760237,
+      0.7929925155296614
+    ],
+    "ys": [
+      0.023279814179665247,
+      0.015258454706800595,
+      0.009636588671134795,
+      0.0058636185962218715,
+      0.0034303179683354557,
+      0.0019508911864085043,
+      0.0010720245656982627,
+      5.727230032611106E-4,
+      2.940392779991596E-4,
+      1.4181349785670868E-4,
+      6.333513533663933E-5,
+      2.5779423268780836E-5,
+      9.34540879758316E-6,
+      3.0570885601346303E-6,
+      8.448187381597023E-7,
+      2.0283376419955368E-7,
+      3.799045552673217E-8,
+      5.257992980887434E-9,
+      4.696318067912855E-10,
+      8.040835683421514E-12
+    ]
+  },
+  "Peak Ground Acceleration": {
+    "xs": [
+      -6.061887011404528,
+      -5.654992310486769,
+      -5.251433780649187,
+      -4.845968672541022,
+      -4.439655747510518,
+      -4.034190639402354,
+      -3.6306105459899607,
+      -3.223888366691745,
+      -2.8184232585835804,
+      -2.4123999590012524,
+      -2.0099154790312257,
+      -1.5994875815809322,
+      -1.1973282616072674,
+      -0.789658080940789,
+      -0.3856624808119846,
+      0.01980262729617973,
+      0.4252677354043441,
+      0.8329091229351039,
+      1.235471471385307,
+      1.6428726885203377
+    ],
+    "ys": [
+      0.16241112120908746,
+      0.1211747452225035,
+      0.08821017091766084,
+      0.062475455947759634,
+      0.0429411432751231,
+      0.028525687803782396,
+      0.018224455950293393,
+      0.011059987400758736,
+      0.006364262004183083,
+      0.0034377054571609225,
+      0.001738825379832288,
+      7.965440914871203E-4,
+      3.3531414903647464E-4,
+      1.2359465951104756E-4,
+      3.997349646564974E-5,
+      1.1017452326436623E-5,
+      2.556220564845531E-6,
+      4.819237373193018E-7,
+      6.872217721500788E-8,
+      5.03174786246266E-9
+    ]
+  },
+  "0.20 Second Spectral Acceleration": {
+    "xs": [
+      -5.704782974989785,
+      -5.30031936921871,
+      -4.8941864814530085,
+      -4.491841500681089,
+      -4.080441657053109,
+      -3.6769508832486624,
+      -3.2728041668937564,
+      -2.866459937849852,
+      -2.4615808244845034,
+      -2.05572501506252,
+      -1.6502599069543555,
+      -1.2447947988461912,
+      -0.8393296907380268,
+      -0.4338645826298623,
+      -0.028399474521698,
+      0.37843643572024505,
+      0.7839015438284094,
+      1.1878434223960523,
+      1.5933085305042167,
+      1.998773638612381
+    ],
+    "ys": [
+      0.20884911299107897,
+      0.16145810468844024,
+      0.11999074916434269,
+      0.08664281640904029,
+      0.06035281081025548,
+      0.04113660286620183,
+      0.02712237329976281,
+      0.017158998663766196,
+      0.010389832056442814,
+      0.005966842420004629,
+      0.0032374258061386835,
+      0.0016481130397465967,
+      7.801989781232735E-4,
+      3.388907756049955E-4,
+      1.3261398028112855E-4,
+      4.5544380625508945E-5,
+      1.3505510623393688E-5,
+      3.379046576023759E-6,
+      6.851474870720804E-7,
+      1.0763757443621396E-7
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-hawaii-2021-KAILUA_KONA_HI.json b/src/test/resources/e2e/nshm-hawaii-2021-KAILUA_KONA_HI.json
new file mode 100644
index 0000000000000000000000000000000000000000..cdfb35eec98a6d9a17e868d8d94607d8210e36a7
--- /dev/null
+++ b/src/test/resources/e2e/nshm-hawaii-2021-KAILUA_KONA_HI.json
@@ -0,0 +1,186 @@
+{
+  "1.00 Second Spectral Acceleration": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      0.9310649618626425,
+      0.7152683525622628,
+      0.5254960437436178,
+      0.37057192881004797,
+      0.25360306935928917,
+      0.1673342748557868,
+      0.10852163641624823,
+      0.06764805605345484,
+      0.04042125038591836,
+      0.02275930256132998,
+      0.012035453130050871,
+      0.006001361401039622,
+      0.002825403258669261,
+      0.0012397199668725764,
+      4.913127725890904E-4,
+      1.6916652515186739E-4,
+      4.608184816695928E-5,
+      9.142956045358946E-6,
+      1.067682459238504E-6,
+      4.4135240737735364E-8
+    ]
+  },
+  "5.00 Second Spectral Acceleration": {
+    "xs": [
+      -6.908755779315721,
+      -6.502290170873972,
+      -6.0968250627658085,
+      -5.692842534617867,
+      -5.286388795682763,
+      -4.882242079327857,
+      -4.474141923581687,
+      -4.0686768154735224,
+      -3.6651629274966204,
+      -3.259697819388456,
+      -2.8542327112802917,
+      -2.448767603172127,
+      -2.0402208285265546,
+      -1.6398971199188088,
+      -1.2310014767138553,
+      -0.8278220838865469,
+      -0.42159449003804794,
+      -0.016129381929883644,
+      0.3920420877760237,
+      0.7929925155296614
+    ],
+    "ys": [
+      0.191466520506286,
+      0.13554779250681923,
+      0.09647775115759329,
+      0.06847614819048337,
+      0.04772578379364718,
+      0.03208679105889853,
+      0.020129540279605004,
+      0.011639202185119844,
+      0.0061951399190677625,
+      0.0030758835356592923,
+      0.0014771509658122373,
+      7.061929082246017E-4,
+      3.3451441585971104E-4,
+      1.5467986387544447E-4,
+      6.363609376236911E-5,
+      2.247131683032451E-5,
+      6.219516642047414E-6,
+      1.2615492254822047E-6,
+      1.5297532779407637E-7,
+      7.198489307670766E-9
+    ]
+  },
+  "Peak Ground Acceleration": {
+    "xs": [
+      -6.061887011404528,
+      -5.654992310486769,
+      -5.251433780649187,
+      -4.845968672541022,
+      -4.439655747510518,
+      -4.034190639402354,
+      -3.6306105459899607,
+      -3.223888366691745,
+      -2.8184232585835804,
+      -2.4123999590012524,
+      -2.0099154790312257,
+      -1.5994875815809322,
+      -1.1973282616072674,
+      -0.789658080940789,
+      -0.3856624808119846,
+      0.01980262729617973,
+      0.4252677354043441,
+      0.8329091229351039,
+      1.235471471385307,
+      1.6428726885203377
+    ],
+    "ys": [
+      1.3099486083268739,
+      1.199523417668875,
+      1.0517265084684115,
+      0.8707860874217463,
+      0.6765138623146243,
+      0.49340163862251196,
+      0.33992289432676787,
+      0.22192803156480623,
+      0.13847632521718928,
+      0.0817533386032545,
+      0.04511099205028913,
+      0.022490754664834876,
+      0.010374939794256521,
+      0.004313773760782856,
+      0.0016216028906538638,
+      5.238693662990279E-4,
+      1.3772717633153163E-4,
+      2.6761997339916372E-5,
+      3.5045913382111145E-6,
+      2.3097496341714198E-7
+    ]
+  },
+  "0.20 Second Spectral Acceleration": {
+    "xs": [
+      -5.704782974989785,
+      -5.30031936921871,
+      -4.8941864814530085,
+      -4.491841500681089,
+      -4.080441657053109,
+      -3.6769508832486624,
+      -3.2728041668937564,
+      -2.866459937849852,
+      -2.4615808244845034,
+      -2.05572501506252,
+      -1.6502599069543555,
+      -1.2447947988461912,
+      -0.8393296907380268,
+      -0.4338645826298623,
+      -0.028399474521698,
+      0.37843643572024505,
+      0.7839015438284094,
+      1.1878434223960523,
+      1.5933085305042167,
+      1.998773638612381
+    ],
+    "ys": [
+      1.3761096429204573,
+      1.2927474893926607,
+      1.178335057078432,
+      1.0275173511479154,
+      0.842703120792494,
+      0.6513972997833428,
+      0.47242900392024684,
+      0.32217060882735266,
+      0.20861884543377657,
+      0.12835589658796198,
+      0.07482094551740774,
+      0.04095407995887267,
+      0.02092944382070038,
+      0.009967533485864724,
+      0.0044001652566261614,
+      0.0017609227596797569,
+      6.180891817013114E-4,
+      1.8154635267886133E-4,
+      4.1290331752591286E-5,
+      6.280186508295586E-6
+    ]
+  }
+}
\ No newline at end of file