diff --git a/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-BOSTON_MA.json b/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-BOSTON_MA.json
index 4ba51b726826d6169acc01ee1a936f3bfd08769e..b7b105a387d0d9e93931f8474c667304c9234071 100644
--- a/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-BOSTON_MA.json
+++ b/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-BOSTON_MA.json
@@ -23,26 +23,26 @@
       1.7119945007591926
     ],
     "ys": [
-      0.020784550979940135,
-      0.01375203615314397,
+      0.02078455097994013,
+      0.013752036153143975,
       0.008853912425965713,
       0.005504502737593539,
-      0.0032956032209899917,
+      0.0032956032209899913,
       0.0018514963923265215,
-      9.931435977960567E-4,
-      4.956595518220793E-4,
+      9.931435977960565E-4,
+      4.956595518220794E-4,
       2.3401548992797762E-4,
-      1.0471944598011257E-4,
-      4.508421273772284E-5,
-      1.889630156023541E-5,
-      7.725874681605785E-6,
-      3.0391435785521572E-6,
-      1.11705158113441E-6,
+      1.0471944598011255E-4,
+      4.5084212737722834E-5,
+      1.8896301560235415E-5,
+      7.725874681605789E-6,
+      3.039143578552157E-6,
+      1.1170515811344102E-6,
       3.745132401726645E-7,
-      1.0752962397804161E-7,
-      2.5960707366581506E-8,
+      1.075296239780416E-7,
+      2.5960707366581502E-8,
       4.917918081492093E-9,
-      6.50338376685779E-10
+      6.503383766857791E-10
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -69,25 +69,25 @@
       0.7929925155296614
     ],
     "ys": [
-      0.0038496686700113564,
-      0.0025078664183317764,
-      0.0015597948853785955,
-      9.157017059864713E-4,
+      0.003849668670011357,
+      0.002507866418331777,
+      0.0015597948853785957,
+      9.157017059864712E-4,
       5.001931310456335E-4,
       2.547249918503188E-4,
       1.1944866239705738E-4,
-      5.232735935686702E-5,
-      2.156118337115127E-5,
-      8.400347720866899E-6,
-      3.14699581817278E-6,
+      5.2327359356867026E-5,
+      2.1561183371151267E-5,
+      8.400347720866897E-6,
+      3.1469958181727794E-6,
       1.1420236854051993E-6,
       3.9303700685767165E-7,
-      1.2947742656347803E-7,
+      1.29477426563478E-7,
       3.7186688126926624E-8,
       9.324871744942213E-9,
       1.877882948712356E-9,
       2.8466329320775234E-10,
-      2.6974731510803595E-11,
+      2.6974731510803592E-11,
       1.0385526508492283E-12
     ]
   },
@@ -116,25 +116,25 @@
     ],
     "ys": [
       0.03915433626110455,
-      0.028874987776381138,
+      0.02887498777638114,
       0.020883581441243287,
       0.014675088491569477,
       0.009966398305490464,
       0.006525399875535823,
       0.004122194389111176,
-      0.002503901284660192,
-      0.0014759816292745382,
-      8.455590549998979E-4,
-      4.7443786929523266E-4,
+      0.0025039012846601928,
+      0.0014759816292745378,
+      8.455590549998978E-4,
+      4.744378692952327E-4,
       2.5614908673281044E-4,
       1.3579297249796823E-4,
       6.854218948534534E-5,
-      3.291803684798865E-5,
-      1.4569587193494358E-5,
+      3.291803684798864E-5,
+      1.4569587193494356E-5,
       5.782794746110381E-6,
       1.9737183250309444E-6,
-      5.657594675445634E-7,
-      1.2462940285422407E-7
+      5.657594675445635E-7,
+      1.246294028542241E-7
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -164,23 +164,23 @@
       0.060547993873405,
       0.04501093716568888,
       0.03238422553470723,
-      0.022605947101161112,
+      0.022605947101161115,
       0.01506013117511144,
-      0.009690757366506484,
-      0.005957079199326997,
+      0.009690757366506481,
+      0.005957079199326996,
       0.0034901075111582196,
-      0.0019627024343097255,
-      0.0010598138716072616,
-      5.526846406248313E-4,
-      2.787643997578851E-4,
+      0.001962702434309725,
+      0.0010598138716072611,
+      5.526846406248314E-4,
+      2.7876439975788503E-4,
       1.358294857340756E-4,
       6.359388081275606E-5,
-      2.8287825293638214E-5,
+      2.828782529363821E-5,
       1.1707073491487447E-5,
       4.4199232564301465E-6,
-      1.4745471754128641E-6,
-      4.142453599294728E-7,
-      9.342364439170645E-8
+      1.4745471754128643E-6,
+      4.1424535992947275E-7,
+      9.342364439170644E-8
     ]
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-CHICAGO_IL.json b/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-CHICAGO_IL.json
index 04374779e42ea09f8ee32e0dce1f2ae7416fbe73..8778b6db270a2b4406edf00939fe18de57afe3f3 100644
--- a/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-CHICAGO_IL.json
+++ b/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-CHICAGO_IL.json
@@ -23,26 +23,26 @@
       1.7119945007591926
     ],
     "ys": [
-      0.017675500237871122,
-      0.011804993270225163,
-      0.007916670756587606,
+      0.017675500237871126,
+      0.011804993270225165,
+      0.007916670756587604,
       0.0053491472480445695,
       0.003631390427708422,
-      0.002384405538478485,
-      0.0014870231028831248,
+      0.0023844055384784845,
+      0.0014870231028831253,
       8.355484214788524E-4,
-      4.1460657776932694E-4,
-      1.7579111278565783E-4,
-      6.240935342700551E-5,
-      1.824083214413613E-5,
-      4.4149279640637774E-6,
+      4.14606577769327E-4,
+      1.7579111278565789E-4,
+      6.24093534270055E-5,
+      1.824083214413612E-5,
+      4.414927964063778E-6,
       9.994457044956116E-7,
       2.4855133647506633E-7,
       7.726459746150785E-8,
       2.121042318488014E-8,
-      4.8605658644149765E-9,
+      4.860565864414977E-9,
       8.641052442615079E-10,
-      1.0633132855584105E-10
+      1.0633132855584103E-10
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -70,24 +70,24 @@
     ],
     "ys": [
       0.004904504983066265,
-      0.003755611824541404,
+      0.0037556118245414046,
       0.002900685498117759,
-      0.0021972569063650727,
-      0.001571497251120379,
+      0.002197256906365073,
+      0.0015714972511203789,
       0.001031785345548251,
-      5.98813717644033E-4,
+      5.988137176440331E-4,
       2.999898092710794E-4,
-      1.2636087757687215E-4,
-      4.334153727062956E-5,
-      1.1727951025836876E-5,
-      2.3832470064242063E-6,
-      3.5209264942037673E-7,
-      3.7851796592772213E-8,
-      5.963076928168123E-9,
+      1.2636087757687212E-4,
+      4.334153727062957E-5,
+      1.172795102583687E-5,
+      2.383247006424206E-6,
+      3.5209264942037663E-7,
+      3.7851796592772227E-8,
+      5.963076928168122E-9,
       1.4910332126633127E-9,
-      3.1417887372376505E-10,
+      3.1417887372376495E-10,
       5.2511189664780556E-11,
-      5.968234937924543E-12,
+      5.968234937924544E-12,
       3.1469632224157163E-13
     ]
   },
@@ -115,26 +115,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.02270915099639857,
-      0.015516400129389082,
+      0.022709150996398565,
+      0.01551640012938908,
       0.01063565058866354,
-      0.007250987342509732,
-      0.00484747526482874,
-      0.003111424318650424,
-      0.0018782779132334618,
-      0.0010500224979932131,
-      5.534113089259502E-4,
+      0.007250987342509733,
+      0.004847475264828739,
+      0.0031114243186504227,
+      0.001878277913233462,
+      0.001050022497993213,
+      5.534113089259501E-4,
       2.81605357092695E-4,
-      1.4369489671881906E-4,
+      1.4369489671881903E-4,
       7.346403339083293E-5,
       3.8325297999058965E-5,
-      1.9431569974270375E-5,
+      1.943156997427037E-5,
       9.42159253961068E-6,
       4.197688438855381E-6,
-      1.6696279770654767E-6,
-      5.688244700978395E-7,
+      1.6696279770654765E-6,
+      5.688244700978394E-7,
       1.6230550529800464E-7,
-      3.549954903295298E-8
+      3.5499549032952975E-8
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -162,25 +162,25 @@
     ],
     "ys": [
       0.04184772415672415,
-      0.028519812182555615,
+      0.02851981218255562,
       0.019028622636528186,
-      0.01259769407876463,
-      0.008183488070776035,
+      0.012597694078764633,
+      0.008183488070776034,
       0.005256326568188243,
-      0.0032378832457639964,
-      0.001863531680168195,
-      9.907119514822528E-4,
+      0.0032378832457639955,
+      0.0018635316801681955,
+      9.907119514822526E-4,
       4.8301305512369827E-4,
-      2.1935879450693264E-4,
+      2.193587945069326E-4,
       9.551470151347578E-5,
       4.124782682724971E-5,
       1.7924007974639768E-5,
-      7.69163382946073E-6,
+      7.691633829460732E-6,
       3.1292561141859636E-6,
       1.1644839692951632E-6,
       3.815542517446424E-7,
       1.0444941528551554E-7,
-      2.2656380775801956E-8
+      2.2656380775801963E-8
     ]
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-LOS_ANGELES_CA.json b/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-LOS_ANGELES_CA.json
index 72661624bef7c0b492e3e0a96ec2ee9f59f3bff5..f83c052f3551b86ae63c3f78595cff562a2eb805 100644
--- a/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-LOS_ANGELES_CA.json
+++ b/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-LOS_ANGELES_CA.json
@@ -76,7 +76,7 @@
       0.035127313944556586,
       0.02246250359719528,
       0.014022392026120642,
-      0.008468146251691492,
+      0.008468146251691493,
       0.004802617000237273,
       0.0024617049089227135,
       0.0011102558974719061,
diff --git a/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-NEW_MADRID_MO.json b/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-NEW_MADRID_MO.json
index cd06e382647b7bc729a29e3bee48aaf3ca72bf49..0b92be7eaf1e062c133ada44ae30c12a227da765 100644
--- a/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-NEW_MADRID_MO.json
+++ b/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-NEW_MADRID_MO.json
@@ -24,25 +24,25 @@
     ],
     "ys": [
       0.05460474620644812,
-      0.039322200263679656,
+      0.03932220026367965,
       0.02774252188858359,
       0.019256487920663253,
       0.013309032474447957,
-      0.009158100387208452,
-      0.006469954492673559,
-      0.004711825464791655,
-      0.003614419968603591,
-      0.002923750899350579,
-      0.0024589761818590034,
-      0.002072470767532478,
+      0.009158100387208453,
+      0.006469954492673557,
+      0.004711825464791652,
+      0.0036144199686035912,
+      0.002923750899350578,
+      0.002458976181859004,
+      0.0020724707675324793,
       0.001663505866018177,
-      0.0012069209745320132,
-      7.580051949212139E-4,
+      0.0012069209745320141,
+      7.580051949212137E-4,
       4.028136886385924E-4,
-      1.7473743872927871E-4,
-      6.14366486371895E-5,
-      1.6603707164663944E-5,
-      3.2819885795529328E-6
+      1.747374387292788E-4,
+      6.143664863718952E-5,
+      1.6603707164663927E-5,
+      3.281988579552932E-6
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
       0.7929925155296614
     ],
     "ys": [
-      0.01118335095019382,
-      0.008208501337863189,
-      0.006125994378655951,
-      0.004704029030923133,
-      0.0037445097750955776,
-      0.003113425325927084,
+      0.011183350950193816,
+      0.00820850133786319,
+      0.0061259943786559495,
+      0.004704029030923134,
+      0.003744509775095578,
+      0.003113425325927083,
       0.0026896900327019677,
-      0.0023879637030226144,
+      0.0023879637030226157,
       0.0021175441107187517,
-      0.0018011501748482464,
-      0.0014173471729516554,
-      0.0010068130175955076,
+      0.0018011501748482462,
+      0.0014173471729516547,
+      0.0010068130175955078,
       6.301951022408455E-4,
-      3.4447816991405077E-4,
-      1.5613960834869736E-4,
-      5.887416288449928E-5,
-      1.7483012613921885E-5,
+      3.44478169914051E-4,
+      1.561396083486973E-4,
+      5.8874162884499284E-5,
+      1.7483012613921882E-5,
       3.8576776780498505E-6,
-      5.776336202494065E-7,
-      3.603564897905063E-8
+      5.776336202494066E-7,
+      3.6035648979050635E-8
     ]
   },
   "Peak Ground Acceleration": {
@@ -116,25 +116,25 @@
     ],
     "ys": [
       0.11111072621136198,
-      0.09432125494016416,
-      0.0782280559960046,
-      0.06292369383675939,
-      0.04897014435727336,
+      0.09432125494016415,
+      0.07822805599600459,
+      0.06292369383675941,
+      0.04897014435727334,
       0.036942153943163344,
-      0.027163843299139255,
-      0.019537877568746236,
+      0.027163843299139245,
+      0.019537877568746243,
       0.013915832488455513,
       0.009887221698272164,
-      0.007094041349666844,
-      0.0051464353161795075,
-      0.0038656085903222065,
-      0.00298376664089472,
-      0.002326071147545303,
-      0.001723713348796734,
-      0.0011265388791854103,
+      0.007094041349666845,
+      0.005146435316179506,
+      0.003865608590322206,
+      0.002983766640894719,
+      0.0023260711475453035,
+      0.0017237133487967337,
+      0.00112653887918541,
       6.015982295191785E-4,
-      2.510477911128342E-4,
-      7.632592705118941E-5
+      2.510477911128341E-4,
+      7.632592705118943E-5
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -163,24 +163,24 @@
     "ys": [
       0.13557175676510383,
       0.11487697773688868,
-      0.09473336922159178,
+      0.09473336922159181,
       0.0757652391662049,
-      0.05806165639924289,
-      0.04307702076073271,
-      0.030893330875149033,
+      0.0580616563992429,
+      0.0430770207607327,
+      0.030893330875149037,
       0.02154336192618488,
       0.014802677054253841,
-      0.010119114510192404,
+      0.010119114510192406,
       0.006988258677940673,
-      0.004954717225520118,
+      0.00495471722552012,
       0.003663126515262554,
-      0.002832444396585898,
-      0.002237940845752876,
-      0.0017164930070629656,
-      0.0011926180558950762,
-      6.965535536645009E-4,
+      0.002832444396585899,
+      0.0022379408457528765,
+      0.0017164930070629654,
+      0.0011926180558950767,
+      6.965535536645008E-4,
       3.2111317564048023E-4,
-      1.1269789534198828E-4
+      1.1269789534198823E-4
     ]
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-NEW_YORK_NY.json b/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-NEW_YORK_NY.json
index a37b667f889e578f83232cf9335e64d1440fc74d..c6edeedbc4774c38d59fc3745742ae2b915ae1da 100644
--- a/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-NEW_YORK_NY.json
+++ b/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-NEW_YORK_NY.json
@@ -25,24 +25,24 @@
     "ys": [
       0.018666421015364292,
       0.012277714382170499,
-      0.007819753747405414,
+      0.007819753747405412,
       0.004783588386662285,
       0.00281121916877259,
-      0.0015540453407317345,
+      0.0015540453407317347,
       8.285075887238436E-4,
-      4.182733081757242E-4,
-      2.0477961806545264E-4,
+      4.182733081757243E-4,
+      2.047796180654526E-4,
       9.768413828648057E-5,
-      4.582979651500822E-5,
+      4.582979651500823E-5,
       2.1108151934584483E-5,
       9.403078808734168E-6,
       3.952177823009205E-6,
-      1.52393681070903E-6,
-      5.283693302216127E-7,
+      1.5239368107090302E-6,
+      5.283693302216128E-7,
       1.553244886867919E-7,
-      3.807576669004163E-8,
+      3.807576669004164E-8,
       7.285190754922316E-9,
-      9.713305930824852E-10
+      9.71330593082485E-10
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -69,25 +69,25 @@
       0.7929925155296614
     ],
     "ys": [
-      0.003683929029161356,
-      0.0023350507514869807,
-      0.0014025796207374245,
-      7.930112908299475E-4,
+      0.0036839290291613555,
+      0.0023350507514869803,
+      0.001402579620737425,
+      7.930112908299476E-4,
       4.1808903382999866E-4,
-      2.0733134457052304E-4,
-      9.623213274255237E-5,
-      4.2792093503938167E-5,
-      1.8488428033840786E-5,
+      2.0733134457052307E-4,
+      9.623213274255235E-5,
+      4.279209350393816E-5,
+      1.848842803384079E-5,
       7.785121676935123E-6,
-      3.20942446688357E-6,
-      1.2788721198896168E-6,
+      3.209424466883569E-6,
+      1.2788721198896172E-6,
       4.764036574053829E-7,
       1.6510378239619124E-7,
       4.934185476859842E-8,
-      1.2738983551119938E-8,
-      2.6202525850572688E-9,
-      4.0485837495960446E-10,
-      3.9044866281994814E-11,
+      1.273898355111994E-8,
+      2.6202525850572684E-9,
+      4.048583749596044E-10,
+      3.904486628199482E-11,
       1.53244519278671E-12
     ]
   },
@@ -115,26 +115,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.029878942979656185,
-      0.021699314985705948,
-      0.015627345176841466,
-      0.011107491120984697,
-      0.007776586292284122,
-      0.005349775331002554,
+      0.02987894297965618,
+      0.02169931498570595,
+      0.015627345176841462,
+      0.011107491120984693,
+      0.0077765862922841225,
+      0.005349775331002555,
       0.003606839800316037,
       0.002364766212564209,
-      0.001511483656252948,
-      9.383042482967953E-4,
-      5.672612883032051E-4,
+      0.0015114836562529481,
+      9.383042482967954E-4,
+      5.672612883032049E-4,
       3.2775630190425725E-4,
       1.837902668533268E-4,
       9.707147245294275E-5,
-      4.8216709391054403E-5,
-      2.186754042561832E-5,
-      8.83267345573992E-6,
+      4.821670939105441E-5,
+      2.1867540425618328E-5,
+      8.832673455739918E-6,
       3.054523154324783E-6,
-      8.84797873298568E-7,
-      1.9672786782893154E-7
+      8.847978732985681E-7,
+      1.9672786782893157E-7
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -162,24 +162,24 @@
     ],
     "ys": [
       0.048301983959234095,
-      0.035049735617640576,
-      0.024744052454742878,
-      0.01709523430471773,
-      0.01141511174006545,
+      0.03504973561764059,
+      0.02474405245474288,
+      0.017095234304717735,
+      0.011415111740065452,
       0.007482577963101015,
-      0.004769873855646253,
+      0.004769873855646252,
       0.002948091284747602,
       0.0017725798590443333,
       0.0010323738247512593,
       5.823000408387338E-4,
       3.169405845714303E-4,
-      1.656074574036077E-4,
+      1.6560745740360768E-4,
       8.238484623559815E-5,
       3.852324830287547E-5,
-      1.657549901909999E-5,
-      6.439186747078615E-6,
-      2.1925820654928872E-6,
-      6.249719391706647E-7,
+      1.6575499019099988E-5,
+      6.439186747078614E-6,
+      2.192582065492888E-6,
+      6.249719391706648E-7,
       1.423888673803234E-7
     ]
   }
diff --git a/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-RENO_NV.json b/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-RENO_NV.json
index 6cc0d1e22722a61d6616a3a861df64fdd5abb500..0d1235f967122d959af817c16f60160951da7a9a 100644
--- a/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-RENO_NV.json
+++ b/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-RENO_NV.json
@@ -38,7 +38,7 @@
       0.0010564988095787104,
       3.945561117465654E-4,
       1.2048922319737728E-4,
-      2.8266770250121335E-5,
+      2.8266770250121338E-5,
       4.252380705836178E-6,
       4.4029329263288646E-7,
       2.5735858318493567E-8,
@@ -72,14 +72,14 @@
       0.1619520024002511,
       0.11197070315750862,
       0.07461644808670248,
-      0.048069314826493036,
+      0.04806931482649303,
       0.029904421907731286,
-      0.018097205110430375,
-      0.010526649862628149,
-      0.0058497036090659794,
+      0.01809720511043038,
+      0.010526649862628147,
+      0.00584970360906598,
       0.003024869157973338,
-      0.001398899091725516,
-      5.607903420664932E-4,
+      0.0013988990917255157,
+      5.607903420664931E-4,
       1.884917390363045E-4,
       5.034839107343866E-5,
       1.033150576172653E-5,
@@ -166,7 +166,7 @@
       0.4943026693905384,
       0.3815237316109364,
       0.2849928378328236,
-      0.20811270361164622,
+      0.20811270361164624,
       0.14726293268062965,
       0.10033741214019079,
       0.06562437576887947,
@@ -176,8 +176,8 @@
       0.007078613802080741,
       0.003434334658947344,
       0.0014729955574711107,
-      5.304815215680369E-4,
-      1.5325010460188717E-4,
+      5.30481521568037E-4,
+      1.532501046018872E-4,
       3.28644051168842E-5,
       4.5541957008082325E-6,
       3.3625843088903307E-7
diff --git a/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-SALT_LAKE_CITY_UT.json b/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-SALT_LAKE_CITY_UT.json
index 07ded0139330a5a04f6bde7ed34216b8b3abac15..e137d00e49aa962c08c66dd8ea44a0d9642dc80f 100644
--- a/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-SALT_LAKE_CITY_UT.json
+++ b/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-SALT_LAKE_CITY_UT.json
@@ -23,26 +23,26 @@
       1.7119945007591926
     ],
     "ys": [
-      0.10141210582180434,
+      0.10141210582180435,
       0.07447849798602045,
       0.05330127231316856,
-      0.03710281879513821,
+      0.037102818795138215,
       0.02523202816726377,
       0.01661034649634634,
       0.010874067593129606,
-      0.0070892247983680825,
-      0.004735625457686324,
+      0.007089224798368081,
+      0.004735625457686323,
       0.003249464756093951,
-      0.0022454952268110232,
-      0.0014914478772558568,
-      8.988552768687258E-4,
-      4.65668093951211E-4,
+      0.002245495226811023,
+      0.0014914478772558575,
+      8.988552768687261E-4,
+      4.656680939512108E-4,
       1.9882970591587773E-4,
       6.785029212800548E-5,
-      1.6876651512201572E-5,
-      2.653741741725594E-6,
-      1.731813940276621E-7,
-      1.0355704040041717E-10
+      1.6876651512201575E-5,
+      2.6537417417255928E-6,
+      1.7318139402766213E-7,
+      1.035570404004172E-10
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
       0.7929925155296614
     ],
     "ys": [
-      0.033387015764916865,
-      0.02465096645560166,
+      0.03338701576491687,
+      0.024650966455601664,
       0.01764423071929716,
       0.012269680846161648,
       0.008337057201618096,
-      0.005635024432572455,
-      0.0037891327023550246,
-      0.002514912378495384,
+      0.005635024432572457,
+      0.003789132702355024,
+      0.002514912378495385,
       0.001586342905921711,
-      9.014315449747966E-4,
-      4.4140296504165355E-4,
-      1.7921117169766214E-4,
-      5.754118100356994E-5,
+      9.014315449747969E-4,
+      4.4140296504165344E-4,
+      1.792111716976622E-4,
+      5.754118100356995E-5,
       1.4224526877692228E-5,
       2.2078569144162738E-6,
-      1.8880753843912258E-7,
-      2.916565870061635E-9,
+      1.888075384391226E-7,
+      2.9165658700616345E-9,
       1.3533194681297857E-11,
       1.4761223207476851E-12,
-      7.365315902026218E-14
+      7.365315902026216E-14
     ]
   },
   "Peak Ground Acceleration": {
@@ -120,21 +120,21 @@
       0.07246017969843055,
       0.05191828655903307,
       0.036365265053184825,
-      0.024993217741374762,
+      0.024993217741374765,
       0.01690096807101634,
       0.011231650127527285,
-      0.007452801108191982,
-      0.005017181957434342,
-      0.003470567929844281,
-      0.002402368539815233,
-      0.0016078002266633955,
-      9.51405381500143E-4,
-      4.6566447216692683E-4,
-      1.7536330043880214E-4,
-      4.811667218966291E-5,
-      8.632653500921544E-6,
+      0.007452801108191981,
+      0.005017181957434341,
+      0.003470567929844282,
+      0.0024023685398152335,
+      0.001607800226663395,
+      9.514053815001429E-4,
+      4.656644721669268E-4,
+      1.7536330043880222E-4,
+      4.811667218966292E-5,
+      8.632653500921547E-6,
       8.008388400062674E-7,
-      2.2680106464068337E-8
+      2.268010646406834E-8
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -162,24 +162,24 @@
     ],
     "ys": [
       0.16740950916822125,
-      0.1301827371821187,
+      0.13018273718211873,
       0.09802333688436565,
       0.0720099099078939,
       0.05129669394322607,
       0.03606585232915037,
-      0.024916005816203585,
-      0.016913099641626243,
+      0.024916005816203582,
+      0.01691309964162624,
       0.011363408680915812,
-      0.0076197373206781166,
+      0.007619737320678115,
       0.0051864199911304905,
       0.003611556059854821,
-      0.002539280536663541,
-      0.0017305585661145013,
-      0.0010724055561078668,
-      5.639609734298516E-4,
-      2.3956867451954396E-4,
-      7.882123713799232E-5,
-      1.8675841989591896E-5,
+      0.0025392805366635405,
+      0.0017305585661145017,
+      0.0010724055561078666,
+      5.639609734298513E-4,
+      2.3956867451954393E-4,
+      7.88212371379923E-5,
+      1.86758419895919E-5,
       2.701116080577684E-6
     ]
   }
diff --git a/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-SAN_FRANCISCO_CA.json b/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-SAN_FRANCISCO_CA.json
index bdab6add07a04925b7e1c103df90fad19b2ceb1c..7d0263436070f0b56379ff320b29de2b58317017 100644
--- a/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-SAN_FRANCISCO_CA.json
+++ b/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-SAN_FRANCISCO_CA.json
@@ -71,16 +71,16 @@
     "ys": [
       0.15758937503731724,
       0.11247692685397598,
-      0.07946884297427435,
+      0.07946884297427433,
       0.05560574371886311,
       0.03824085383493095,
       0.02585465059626231,
-      0.01705053462827973,
+      0.017050534628279733,
       0.011010094459237604,
       0.006875269673181763,
-      0.004031893488663089,
+      0.004031893488663088,
       0.002153405881721273,
-      0.001013260773576697,
+      0.0010132607735766975,
       4.0392561747766895E-4,
       1.357315165926373E-4,
       3.5070265791185964E-5,
@@ -162,7 +162,7 @@
     ],
     "ys": [
       0.8463434568144551,
-      0.6798282480043856,
+      0.6798282480043855,
       0.529575106126662,
       0.4029924331123037,
       0.2978878788706715,
diff --git a/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-SEATTLE_WA.json b/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-SEATTLE_WA.json
index f9d0ce4222d156b6b422b8ec6c11f6c49c209909..2480ad4d372d40bbc33e2158e73ba57517966aa5 100644
--- a/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-SEATTLE_WA.json
+++ b/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-SEATTLE_WA.json
@@ -27,17 +27,17 @@
       0.15035830377424855,
       0.11450746102005706,
       0.08372212205395722,
-      0.059056934946773325,
+      0.05905693494677332,
       0.03979043310304015,
       0.02608186984634462,
-      0.01639011789619338,
+      0.016390117896193383,
       0.009939769051733804,
-      0.0057322926082014215,
-      0.0030911152287355775,
+      0.005732292608201422,
+      0.003091115228735578,
       0.0015239775147447624,
-      6.709168675782273E-4,
+      6.709168675782274E-4,
       2.574847006859803E-4,
-      8.37874171428662E-5,
+      8.378741714286619E-5,
       2.251661394813441E-5,
       4.500727576177568E-6,
       6.144243207535918E-7,
@@ -70,20 +70,20 @@
     ],
     "ys": [
       0.05798340021258256,
-      0.04190422736568196,
-      0.029366243207829653,
-      0.01992526977609041,
-      0.013059136945119223,
+      0.041904227365681966,
+      0.02936624320782965,
+      0.019925269776090406,
+      0.013059136945119225,
       0.008356470041248173,
-      0.005219092927360337,
-      0.0032087975808839635,
-      0.0019199405262616408,
-      0.0010855264302155059,
-      5.619278902307794E-4,
-      2.563270845634498E-4,
-      9.795826467321658E-5,
-      3.0939506848565075E-5,
-      7.164683336505891E-6,
+      0.005219092927360336,
+      0.003208797580883965,
+      0.0019199405262616406,
+      0.0010855264302155057,
+      5.619278902307795E-4,
+      2.563270845634497E-4,
+      9.79582646732166E-5,
+      3.093950684856507E-5,
+      7.16468333650589E-6,
       9.927613969917701E-7,
       3.041624502650113E-8,
       2.0591305604095127E-11,
@@ -115,24 +115,24 @@
       1.6428726885203377
     ],
     "ys": [
-      0.24771893078422802,
+      0.247718930784228,
       0.21523675836712636,
-      0.18161823548824615,
+      0.18161823548824618,
       0.1478057991464071,
-      0.11545178047071235,
-      0.08622984829115031,
+      0.11545178047071233,
+      0.08622984829115032,
       0.061430834058407394,
-      0.0414783202603966,
+      0.04147832026039659,
       0.026613647847004044,
-      0.016122062107857667,
+      0.016122062107857674,
       0.009167459234650009,
-      0.0047229038072055946,
+      0.004722903807205595,
       0.002214599540841417,
       8.96285507325836E-4,
       3.067999345972684E-4,
-      8.267322513113308E-5,
+      8.26732251311331E-5,
       1.5932119719803484E-5,
-      1.7946631532952552E-6,
+      1.7946631532952554E-6,
       1.06895828117477E-7,
       6.68125464781831E-10
     ]
@@ -161,25 +161,25 @@
       1.998773638612381
     ],
     "ys": [
-      0.27215747755947084,
-      0.24281747775616977,
+      0.2721574775594709,
+      0.24281747775616974,
       0.2111408438896052,
       0.17854755392401112,
-      0.14527845926431035,
+      0.14527845926431032,
       0.11415150096883399,
       0.08587864028339966,
-      0.061548461430163195,
-      0.04205905132892357,
-      0.027299698171629392,
+      0.06154846143016319,
+      0.04205905132892356,
+      0.02729969817162939,
       0.01678063082631571,
       0.009668716589318763,
-      0.005145168066638075,
+      0.005145168066638074,
       0.002484010178699564,
-      0.0010642217286274947,
+      0.0010642217286274949,
       3.910335843512345E-4,
-      1.1883832638818702E-4,
+      1.1883832638818703E-4,
       2.8076658021732084E-5,
-      4.561137287903131E-6,
+      4.561137287903132E-6,
       4.7281340794708457E-7
     ]
   }
diff --git a/src/test/resources/e2e/nshm-hawaii-2.0.2/nshm-hawaii-2.0.2-2021-HILO_HI.json b/src/test/resources/e2e/nshm-hawaii-2.0.2/nshm-hawaii-2.0.2-2021-HILO_HI.json
index 123eb8f48ad0c66cd0401ad7384d855ec3783f3a..acb6169c70584b78ad35023bfa8e5cb53311bd77 100644
--- a/src/test/resources/e2e/nshm-hawaii-2.0.2/nshm-hawaii-2.0.2-2021-HILO_HI.json
+++ b/src/test/resources/e2e/nshm-hawaii-2.0.2/nshm-hawaii-2.0.2-2021-HILO_HI.json
@@ -23,26 +23,26 @@
       1.7119945007591926
     ],
     "ys": [
-      1.1394279599298858,
-      0.909645925740205,
+      1.139427959929886,
+      0.9096459257402049,
       0.6810439562313703,
-      0.48213438998284386,
+      0.4821343899828438,
       0.3270662494936988,
       0.2122733790095776,
-      0.13579352589768764,
+      0.13579352589768767,
       0.08466990088453301,
-      0.051479667241025914,
-      0.029592215233161495,
+      0.0514796672410259,
+      0.0295922152331615,
       0.015605186053687877,
       0.007369438722986227,
-      0.003079134500128523,
+      0.0030791345001285235,
       0.001133816052813239,
       3.683841726832001E-4,
-      1.0771529770871671E-4,
+      1.0771529770871668E-4,
       2.7590429340726252E-5,
       6.106383784135073E-6,
-      9.141545957726993E-7,
-      4.716658318737339E-8
+      9.141545957726994E-7,
+      4.71665831873734E-8
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -69,19 +69,19 @@
       0.7929925155296614
     ],
     "ys": [
-      0.24225805041057025,
+      0.24225805041057027,
       0.1626494298061276,
-      0.11286823232748022,
+      0.11286823232748021,
       0.08019936527365806,
       0.057001082377164766,
-      0.0397723104642292,
+      0.03977231046422921,
       0.026270923994779784,
-      0.0159300182060438,
-      0.008586807484419113,
+      0.015930018206043797,
+      0.008586807484419114,
       0.0040091692633346795,
-      0.0016237229130359047,
+      0.0016237229130359049,
       5.831580842583807E-4,
-      1.935491083341371E-4,
+      1.9354910833413707E-4,
       6.446411351755592E-5,
       2.0541404464536928E-5,
       5.89324452995356E-6,
@@ -125,12 +125,12 @@
       0.3230521403675808,
       0.19728774899189122,
       0.11230291486323443,
-      0.05999879240178362,
+      0.059998792401783616,
       0.029038427625475594,
-      0.012752442114810743,
+      0.012752442114810742,
       0.004825259624029285,
-      0.0015856433122290355,
-      4.4673619962028584E-4,
+      0.0015856433122290357,
+      4.467361996202859E-4,
       1.0815891326044897E-4,
       2.1501975995084003E-5,
       3.0877820264321665E-6,
@@ -162,21 +162,21 @@
     ],
     "ys": [
       1.4371068709113273,
-      1.3442294606163505,
+      1.3442294606163503,
       1.2504550788598903,
-      1.145108478540398,
-      1.0076845134906756,
+      1.1451084785403978,
+      1.0076845134906758,
       0.8393355383077514,
       0.6496537972367906,
       0.4625305796292689,
-      0.30353482643208957,
-      0.1840984877001757,
+      0.3035348264320895,
+      0.18409848770017573,
       0.10404729414822564,
-      0.054920827101472565,
+      0.05492082710147256,
       0.026929508320917738,
       0.012117250742785222,
       0.004912231979440461,
-      0.0017509584506394304,
+      0.0017509584506394302,
       5.433850247572385E-4,
       1.4341185451814312E-4,
       3.1018961899754435E-5,
diff --git a/src/test/resources/e2e/nshm-hawaii-2.0.2/nshm-hawaii-2.0.2-2021-HONOLULU_HI.json b/src/test/resources/e2e/nshm-hawaii-2.0.2/nshm-hawaii-2.0.2-2021-HONOLULU_HI.json
index 33d143aca4cdf4073325bc535258914afcccf30d..03cb7fa83ba990e08680ee22f97fad013ed87dfd 100644
--- a/src/test/resources/e2e/nshm-hawaii-2.0.2/nshm-hawaii-2.0.2-2021-HONOLULU_HI.json
+++ b/src/test/resources/e2e/nshm-hawaii-2.0.2/nshm-hawaii-2.0.2-2021-HONOLULU_HI.json
@@ -26,8 +26,8 @@
       0.1096176362431887,
       0.07712267985209978,
       0.052362164725512236,
-      0.03410083982464372,
-      0.021327885700315224,
+      0.03410083982464373,
+      0.02132788570031522,
       0.012597455865731777,
       0.007195466062794852,
       0.0039020156778838797,
@@ -36,13 +36,13 @@
       4.744665345271375E-4,
       2.0784677016393618E-4,
       8.354936782969439E-5,
-      3.0262362405560818E-5,
+      3.026236240556082E-5,
       9.700628718654082E-6,
       2.7338866176016795E-6,
-      6.418080520161567E-7,
+      6.418080520161568E-7,
       1.2432205810419981E-7,
       1.6644800833465068E-8,
-      8.894088492362762E-10
+      8.894088492362763E-10
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -83,7 +83,7 @@
       2.5779423268780836E-5,
       9.34540879758316E-6,
       3.0570885601346303E-6,
-      8.448187381597023E-7,
+      8.448187381597024E-7,
       2.0283376419955368E-7,
       3.799045552673217E-8,
       5.257992980887434E-9,
@@ -117,19 +117,19 @@
     "ys": [
       0.16241112120908746,
       0.12117474522250349,
-      0.08821017091766084,
+      0.08821017091766083,
       0.06247545594775962,
-      0.0429411432751231,
+      0.042941143275123106,
       0.028525687803782396,
       0.018224455950293393,
-      0.011059987400758736,
-      0.006364262004183082,
+      0.011059987400758737,
+      0.006364262004183083,
       0.0034377054571609225,
       0.0017388253798322879,
       7.965440914871203E-4,
       3.3531414903647464E-4,
       1.2359465951104756E-4,
-      3.997349646564973E-5,
+      3.997349646564974E-5,
       1.1017452326436623E-5,
       2.556220564845531E-6,
       4.819237373193018E-7,
@@ -162,18 +162,18 @@
     ],
     "ys": [
       0.20884911299107894,
-      0.16145810468844024,
+      0.1614581046884402,
       0.1199907491643427,
       0.08664281640904029,
-      0.06035281081025548,
-      0.04113660286620183,
-      0.02712237329976281,
+      0.06035281081025549,
+      0.041136602866201834,
+      0.027122373299762817,
       0.017158998663766196,
       0.010389832056442814,
-      0.005966842420004629,
-      0.0032374258061386835,
+      0.005966842420004628,
+      0.003237425806138684,
       0.0016481130397465967,
-      7.801989781232735E-4,
+      7.801989781232736E-4,
       3.388907756049955E-4,
       1.3261398028112855E-4,
       4.5544380625508945E-5,
diff --git a/src/test/resources/e2e/nshm-hawaii-2.0.2/nshm-hawaii-2.0.2-2021-KAILUA_KONA_HI.json b/src/test/resources/e2e/nshm-hawaii-2.0.2/nshm-hawaii-2.0.2-2021-KAILUA_KONA_HI.json
index 7907a733eb7e3fe6f95c122a226275000dcc07c8..af0bf12850f6e49990211ee094e570f5f629f0b3 100644
--- a/src/test/resources/e2e/nshm-hawaii-2.0.2/nshm-hawaii-2.0.2-2021-KAILUA_KONA_HI.json
+++ b/src/test/resources/e2e/nshm-hawaii-2.0.2/nshm-hawaii-2.0.2-2021-KAILUA_KONA_HI.json
@@ -23,7 +23,7 @@
       1.7119945007591926
     ],
     "ys": [
-      0.9310649618626425,
+      0.9310649618626424,
       0.7152683525622627,
       0.5254960437436178,
       0.37057192881004797,
@@ -31,15 +31,15 @@
       0.1673342748557868,
       0.10852163641624823,
       0.06764805605345484,
-      0.04042125038591836,
-      0.02275930256132998,
+      0.040421250385918366,
+      0.022759302561329985,
       0.012035453130050871,
-      0.006001361401039622,
+      0.00600136140103962,
       0.002825403258669261,
-      0.0012397199668725764,
-      4.913127725890904E-4,
+      0.0012397199668725762,
+      4.913127725890903E-4,
       1.6916652515186739E-4,
-      4.608184816695928E-5,
+      4.6081848166959275E-5,
       9.142956045358946E-6,
       1.067682459238504E-6,
       4.413524073773537E-8
@@ -72,21 +72,21 @@
       0.191466520506286,
       0.13554779250681923,
       0.09647775115759329,
-      0.06847614819048337,
-      0.04772578379364718,
+      0.06847614819048335,
+      0.04772578379364717,
       0.03208679105889853,
-      0.020129540279605004,
+      0.020129540279605,
       0.011639202185119844,
-      0.0061951399190677625,
-      0.0030758835356592914,
+      0.006195139919067763,
+      0.003075883535659292,
       0.0014771509658122375,
       7.061929082246017E-4,
       3.34514415859711E-4,
       1.5467986387544445E-4,
       6.363609376236911E-5,
-      2.247131683032451E-5,
+      2.2471316830324507E-5,
       6.219516642047412E-6,
-      1.2615492254822047E-6,
+      1.2615492254822045E-6,
       1.5297532779407637E-7,
       7.198489307670766E-9
     ]
@@ -116,23 +116,23 @@
     ],
     "ys": [
       1.3099486083268739,
-      1.1995234176688747,
-      1.0517265084684118,
+      1.199523417668875,
+      1.0517265084684115,
       0.8707860874217463,
       0.6765138623146243,
-      0.49340163862251196,
+      0.493401638622512,
       0.33992289432676787,
-      0.22192803156480623,
+      0.2219280315648062,
       0.13847632521718928,
-      0.0817533386032545,
+      0.08175333860325448,
       0.04511099205028912,
       0.022490754664834876,
-      0.01037493979425652,
+      0.010374939794256521,
       0.004313773760782856,
       0.0016216028906538638,
       5.238693662990279E-4,
-      1.377271763315316E-4,
-      2.6761997339916372E-5,
+      1.3772717633153163E-4,
+      2.676199733991637E-5,
       3.5045913382111136E-6,
       2.30974963417142E-7
     ]
@@ -163,20 +163,20 @@
     "ys": [
       1.3761096429204573,
       1.2927474893926607,
-      1.178335057078432,
+      1.1783350570784317,
       1.0275173511479154,
       0.842703120792494,
       0.6513972997833428,
-      0.47242900392024684,
-      0.32217060882735266,
+      0.4724290039202468,
+      0.3221706088273527,
       0.20861884543377657,
       0.128355896587962,
       0.07482094551740774,
       0.040954079958872666,
       0.02092944382070038,
       0.009967533485864722,
-      0.004400165256626161,
-      0.0017609227596797569,
+      0.00440016525662616,
+      0.0017609227596797564,
       6.180891817013114E-4,
       1.815463526788613E-4,
       4.1290331752591286E-5,