diff --git a/src/test/resources/e2e/nshm-hawaii-2021/HILO_HI.json b/src/test/resources/e2e/nshm-hawaii-2021/HILO_HI.json
index d6ebbb57607012d9632569477d7f7c22c32caba2..233ce9205648a3f3210594c400674ce427731b77 100644
--- a/src/test/resources/e2e/nshm-hawaii-2021/HILO_HI.json
+++ b/src/test/resources/e2e/nshm-hawaii-2021/HILO_HI.json
@@ -1,96 +1,4 @@
 {
-  "SA1P0": {
-    "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.08466990088453301,
-      0.051479667241025914,
-      0.029592215233161495,
-      0.015605186053687877,
-      0.007369438722986227,
-      0.003079134500128523,
-      0.001133816052813239,
-      3.683841726832002E-4,
-      1.077152977087167E-4,
-      2.7590429340726252E-5,
-      6.106383784135073E-6,
-      9.141545957726994E-7,
-      4.7166583187373387E-8
-    ]
-  },
-  "SA5P0": {
-    "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.11286823232748024,
-      0.08019936527365806,
-      0.057001082377164766,
-      0.03977231046422921,
-      0.026270923994779784,
-      0.0159300182060438,
-      0.008586807484419113,
-      0.0040091692633346795,
-      0.0016237229130359047,
-      5.831580842583807E-4,
-      1.9354910833413707E-4,
-      6.446411351755592E-5,
-      2.0541404464536928E-5,
-      5.89324452995356E-6,
-      1.3026715401568408E-6,
-      2.061368668443604E-7,
-      2.2313612928494355E-8,
-      3.427414499140028E-10
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -182,5 +90,97 @@
       3.1018961899754435E-5,
       5.139667971021216E-6
     ]
+  },
+  "SA1P0": {
+    "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.08466990088453301,
+      0.051479667241025914,
+      0.029592215233161495,
+      0.015605186053687877,
+      0.007369438722986227,
+      0.003079134500128523,
+      0.001133816052813239,
+      3.683841726832002E-4,
+      1.077152977087167E-4,
+      2.7590429340726252E-5,
+      6.106383784135073E-6,
+      9.141545957726994E-7,
+      4.7166583187373387E-8
+    ]
+  },
+  "SA5P0": {
+    "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.11286823232748024,
+      0.08019936527365806,
+      0.057001082377164766,
+      0.03977231046422921,
+      0.026270923994779784,
+      0.0159300182060438,
+      0.008586807484419113,
+      0.0040091692633346795,
+      0.0016237229130359047,
+      5.831580842583807E-4,
+      1.9354910833413707E-4,
+      6.446411351755592E-5,
+      2.0541404464536928E-5,
+      5.89324452995356E-6,
+      1.3026715401568408E-6,
+      2.061368668443604E-7,
+      2.2313612928494355E-8,
+      3.427414499140028E-10
+    ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-hawaii-2021/HONOLULU_HI.json b/src/test/resources/e2e/nshm-hawaii-2021/HONOLULU_HI.json
index eb99e2dca984d4fc15ff043aebe204a57209eb38..80b5e34b7950b2842a7a1dcb658270e75048881e 100644
--- a/src/test/resources/e2e/nshm-hawaii-2021/HONOLULU_HI.json
+++ b/src/test/resources/e2e/nshm-hawaii-2021/HONOLULU_HI.json
@@ -1,96 +1,4 @@
 {
-  "SA1P0": {
-    "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.05236216472551225,
-      0.03410083982464373,
-      0.02132788570031522,
-      0.012597455865731777,
-      0.007195466062794852,
-      0.0039020156778838797,
-      0.0020347763827356416,
-      0.0010104978512827576,
-      4.744665345271375E-4,
-      2.0784677016393615E-4,
-      8.354936782969439E-5,
-      3.0262362405560818E-5,
-      9.700628718654082E-6,
-      2.73388661760168E-6,
-      6.418080520161568E-7,
-      1.2432205810419981E-7,
-      1.6644800833465068E-8,
-      8.894088492362763E-10
-    ]
-  },
-  "SA5P0": {
-    "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.448187381597024E-7,
-      2.0283376419955368E-7,
-      3.799045552673217E-8,
-      5.257992980887434E-9,
-      4.696318067912854E-10,
-      8.040835683421514E-12
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -182,5 +90,97 @@
       6.851474870720804E-7,
       1.0763757443621396E-7
     ]
+  },
+  "SA1P0": {
+    "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.05236216472551225,
+      0.03410083982464373,
+      0.02132788570031522,
+      0.012597455865731777,
+      0.007195466062794852,
+      0.0039020156778838797,
+      0.0020347763827356416,
+      0.0010104978512827576,
+      4.744665345271375E-4,
+      2.0784677016393615E-4,
+      8.354936782969439E-5,
+      3.0262362405560818E-5,
+      9.700628718654082E-6,
+      2.73388661760168E-6,
+      6.418080520161568E-7,
+      1.2432205810419981E-7,
+      1.6644800833465068E-8,
+      8.894088492362763E-10
+    ]
+  },
+  "SA5P0": {
+    "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.448187381597024E-7,
+      2.0283376419955368E-7,
+      3.799045552673217E-8,
+      5.257992980887434E-9,
+      4.696318067912854E-10,
+      8.040835683421514E-12
+    ]
   }
 }
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
index d5764459162ab229d6ef6b792a4b66d12f49cc98..cc2da68040f8206059df6479d1dcc0ae0b6a5209 100644
--- a/src/test/resources/e2e/nshm-hawaii-2021/KAILUA_KONA_HI.json
+++ b/src/test/resources/e2e/nshm-hawaii-2021/KAILUA_KONA_HI.json
@@ -1,96 +1,4 @@
 {
-  "SA1P0": {
-    "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.9310649618626424,
-      0.7152683525622628,
-      0.5254960437436178,
-      0.37057192881004797,
-      0.25360306935928917,
-      0.1673342748557868,
-      0.10852163641624823,
-      0.06764805605345484,
-      0.040421250385918366,
-      0.022759302561329985,
-      0.012035453130050871,
-      0.00600136140103962,
-      0.002825403258669261,
-      0.0012397199668725764,
-      4.913127725890904E-4,
-      1.6916652515186739E-4,
-      4.6081848166959275E-5,
-      9.142956045358946E-6,
-      1.067682459238504E-6,
-      4.4135240737735364E-8
-    ]
-  },
-  "SA5P0": {
-    "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.04772578379364717,
-      0.03208679105889853,
-      0.020129540279605,
-      0.011639202185119844,
-      0.0061951399190677625,
-      0.003075883535659292,
-      0.0014771509658122375,
-      7.061929082246017E-4,
-      3.3451441585971104E-4,
-      1.5467986387544445E-4,
-      6.363609376236911E-5,
-      2.247131683032451E-5,
-      6.219516642047414E-6,
-      1.2615492254822047E-6,
-      1.5297532779407637E-7,
-      7.198489307670766E-9
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -182,5 +90,97 @@
       4.1290331752591286E-5,
       6.280186508295586E-6
     ]
+  },
+  "SA1P0": {
+    "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.9310649618626424,
+      0.7152683525622628,
+      0.5254960437436178,
+      0.37057192881004797,
+      0.25360306935928917,
+      0.1673342748557868,
+      0.10852163641624823,
+      0.06764805605345484,
+      0.040421250385918366,
+      0.022759302561329985,
+      0.012035453130050871,
+      0.00600136140103962,
+      0.002825403258669261,
+      0.0012397199668725764,
+      4.913127725890904E-4,
+      1.6916652515186739E-4,
+      4.6081848166959275E-5,
+      9.142956045358946E-6,
+      1.067682459238504E-6,
+      4.4135240737735364E-8
+    ]
+  },
+  "SA5P0": {
+    "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.04772578379364717,
+      0.03208679105889853,
+      0.020129540279605,
+      0.011639202185119844,
+      0.0061951399190677625,
+      0.003075883535659292,
+      0.0014771509658122375,
+      7.061929082246017E-4,
+      3.3451441585971104E-4,
+      1.5467986387544445E-4,
+      6.363609376236911E-5,
+      2.247131683032451E-5,
+      6.219516642047414E-6,
+      1.2615492254822047E-6,
+      1.5297532779407637E-7,
+      7.198489307670766E-9
+    ]
   }
 }