diff --git a/src/test/resources/e2e/nshm-alaska-2007/ANCHORAGE_AK.json b/src/test/resources/e2e/nshm-alaska-2007/ANCHORAGE_AK.json
index 5ab02cbd60df91f5146c87892e4e86886ed412bf..dce642d097cab7bd059eda068ae9c6601bf116ab 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/ANCHORAGE_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/ANCHORAGE_AK.json
@@ -1,50 +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.2264112924120234,
-      1.0130512209664995,
-      0.7922530404574435,
-      0.5845793026436414,
-      0.40948452443114636,
-      0.2701877564144387,
-      0.17153207603363751,
-      0.10302708940800644,
-      0.05859440515291784,
-      0.030795114630204887,
-      0.014682892533395813,
-      0.006335021583353106,
-      0.002520765819334627,
-      9.186393104929187E-4,
-      2.783076458862005E-4,
-      6.191426810623913E-5,
-      7.185728855298651E-6,
-      4.5801849257632056E-8,
-      4.150306342389818E-11,
-      0.0
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -136,5 +90,51 @@
       8.209138694463464E-7,
       7.2501279465804674E-9
     ]
+  },
+  "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.2264112924120234,
+      1.0130512209664995,
+      0.7922530404574435,
+      0.5845793026436414,
+      0.40948452443114636,
+      0.2701877564144387,
+      0.17153207603363751,
+      0.10302708940800644,
+      0.05859440515291784,
+      0.030795114630204887,
+      0.014682892533395813,
+      0.006335021583353106,
+      0.002520765819334627,
+      9.186393104929187E-4,
+      2.783076458862005E-4,
+      6.191426810623913E-5,
+      7.185728855298651E-6,
+      4.5801849257632056E-8,
+      4.150306342389818E-11,
+      0.0
+    ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-alaska-2007/FAIRBANKS_AK.json b/src/test/resources/e2e/nshm-alaska-2007/FAIRBANKS_AK.json
index 596c48db81cb4a9a83348e95c17120a40900a2d4..52225a6fcc4e9d9677a66625694ff09f4a13cac8 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/FAIRBANKS_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/FAIRBANKS_AK.json
@@ -1,50 +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.3579707181853255,
-      0.2876987126769738,
-      0.2161973568686493,
-      0.15154369220846364,
-      0.1000432007569064,
-      0.06178566373277879,
-      0.03666603494724606,
-      0.020552165118987144,
-      0.010941529185374504,
-      0.005426831311015517,
-      0.0024683139938808936,
-      0.0010104231156229232,
-      3.6483773608183754E-4,
-      1.1160888079220879E-4,
-      2.7953221062312066E-5,
-      5.271529944160336E-6,
-      5.907387765772356E-7,
-      2.8051670944348496E-8,
-      3.2640527676385684E-10,
-      0.0
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -136,5 +90,51 @@
       3.4044289504614473E-7,
       3.762744898891126E-9
     ]
+  },
+  "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.3579707181853255,
+      0.2876987126769738,
+      0.2161973568686493,
+      0.15154369220846364,
+      0.1000432007569064,
+      0.06178566373277879,
+      0.03666603494724606,
+      0.020552165118987144,
+      0.010941529185374504,
+      0.005426831311015517,
+      0.0024683139938808936,
+      0.0010104231156229232,
+      3.6483773608183754E-4,
+      1.1160888079220879E-4,
+      2.7953221062312066E-5,
+      5.271529944160336E-6,
+      5.907387765772356E-7,
+      2.8051670944348496E-8,
+      3.2640527676385684E-10,
+      0.0
+    ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-alaska-2007/JUNEAU_AK.json b/src/test/resources/e2e/nshm-alaska-2007/JUNEAU_AK.json
index 6445e4458d324e3128a6b60e9204dbddfeb36c00..fcb5daed98a8e3bb813535d9a7301a4943841613 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/JUNEAU_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/JUNEAU_AK.json
@@ -1,50 +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.16511811331797466,
-      0.13341073384176416,
-      0.10385618456014634,
-      0.07902188859550191,
-      0.060018273294110976,
-      0.04528787827937676,
-      0.03363944818919821,
-      0.023361198780357813,
-      0.014729158649896958,
-      0.008263769244431687,
-      0.004070643006385593,
-      0.0016897632184527708,
-      5.577598349609066E-4,
-      1.3686390458969688E-4,
-      2.1816420596039634E-5,
-      2.2352701196940556E-6,
-      1.797907745395782E-7,
-      3.505992629167848E-9,
-      2.6574564716418673E-11,
-      0.0
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -136,5 +90,51 @@
       2.7618125380620528E-8,
       3.0346597226294626E-10
     ]
+  },
+  "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.16511811331797466,
+      0.13341073384176416,
+      0.10385618456014634,
+      0.07902188859550191,
+      0.060018273294110976,
+      0.04528787827937676,
+      0.03363944818919821,
+      0.023361198780357813,
+      0.014729158649896958,
+      0.008263769244431687,
+      0.004070643006385593,
+      0.0016897632184527708,
+      5.577598349609066E-4,
+      1.3686390458969688E-4,
+      2.1816420596039634E-5,
+      2.2352701196940556E-6,
+      1.797907745395782E-7,
+      3.505992629167848E-9,
+      2.6574564716418673E-11,
+      0.0
+    ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-alaska-2007/KODIAK_AK.json b/src/test/resources/e2e/nshm-alaska-2007/KODIAK_AK.json
index 71a8362ba9102e0986fce3205dbe74b545133371..e7f40369df0250c40228e54cd78ac34fba47d75c 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/KODIAK_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/KODIAK_AK.json
@@ -1,50 +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.025532000785376,
-      0.8431494646534106,
-      0.6539381720622285,
-      0.47760914477051053,
-      0.33153535611135243,
-      0.21782718962885356,
-      0.13909411174965414,
-      0.08566226732937617,
-      0.051713628585688676,
-      0.03041336789622197,
-      0.017185615957543664,
-      0.00909095804527792,
-      0.0043637971586372995,
-      0.0018093070914810944,
-      5.897333191354899E-4,
-      1.3387369180688693E-4,
-      1.655933871082143E-5,
-      4.295128471502182E-8,
-      0.0,
-      0.0
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -136,5 +90,51 @@
       7.927603848727249E-7,
       5.993776825224994E-9
     ]
+  },
+  "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.025532000785376,
+      0.8431494646534106,
+      0.6539381720622285,
+      0.47760914477051053,
+      0.33153535611135243,
+      0.21782718962885356,
+      0.13909411174965414,
+      0.08566226732937617,
+      0.051713628585688676,
+      0.03041336789622197,
+      0.017185615957543664,
+      0.00909095804527792,
+      0.0043637971586372995,
+      0.0018093070914810944,
+      5.897333191354899E-4,
+      1.3387369180688693E-4,
+      1.655933871082143E-5,
+      4.295128471502182E-8,
+      0.0,
+      0.0
+    ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-alaska-2007/VALDEZ_AK.json b/src/test/resources/e2e/nshm-alaska-2007/VALDEZ_AK.json
index 3a56a718926bca3c3e410862bfb199c761b969aa..d5f7272fc7224ea3fa155bac3d249280d1cad008 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/VALDEZ_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/VALDEZ_AK.json
@@ -1,50 +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.8059935642199796,
-      0.6628025988279755,
-      0.5130848761444204,
-      0.37334379917625177,
-      0.2574618130649236,
-      0.1668802689507941,
-      0.1038507671950509,
-      0.06115368099871682,
-      0.03452531094845143,
-      0.018603578147822663,
-      0.00956051741874846,
-      0.004689990484845557,
-      0.0022235404552280497,
-      0.0010111417491271402,
-      4.0201835791559096E-4,
-      1.2046253935740112E-4,
-      2.2072704517587235E-5,
-      1.5276946097946847E-6,
-      0.0,
-      0.0
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -136,5 +90,51 @@
       7.556890746184725E-7,
       5.44663885326246E-9
     ]
+  },
+  "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.8059935642199796,
+      0.6628025988279755,
+      0.5130848761444204,
+      0.37334379917625177,
+      0.2574618130649236,
+      0.1668802689507941,
+      0.1038507671950509,
+      0.06115368099871682,
+      0.03452531094845143,
+      0.018603578147822663,
+      0.00956051741874846,
+      0.004689990484845557,
+      0.0022235404552280497,
+      0.0010111417491271402,
+      4.0201835791559096E-4,
+      1.2046253935740112E-4,
+      2.2072704517587235E-5,
+      1.5276946097946847E-6,
+      0.0,
+      0.0
+    ]
   }
 }