diff --git a/test/test_sw07_estimation_2nd.jl b/test/test_sw07_estimation_2nd.jl
index bc71a65d..9f63179f 100644
--- a/test/test_sw07_estimation_2nd.jl
+++ b/test/test_sw07_estimation_2nd.jl
@@ -264,9 +264,9 @@ elseif priors == "tighter"
     Beta(0.5, 0.15, μσ = true),         # cindp
     Beta(0.5, 0.15, μσ = true),      # czcap
     Normal(1.25, 0.125),                  # cfc
-    Gamma(1.5, 0.25, μσ = true),                    # crpi
-    Beta(0.75, 0.10, μσ = true),        # crr
-    Gamma(0.125, 0.05, μσ = true),                # cry
+    Gamma(1.75, 0.25, μσ = true),                    # crpi
+    Beta(0.5, 0.2, μσ = true),        # crr
+    Gamma(0.25, 0.05, μσ = true),                # cry
     # Gamma(0.0001, 0.0000001,0.0, 0.000001, μσ = true),                # crdy
     Gamma(0.475, 0.025, μσ = true),         # constepinf
     Gamma(0.25, 0.1, μσ = true),         # constebeta
@@ -412,9 +412,10 @@ Turing.@model function SW07_loglikelihood_function(data, m, observables, fixed_p
         crdy = 0
 
         ctou, clandaw, cg, curvp, curvw = all_params[35 .+ (1:5)]
+    else
+        z_ea, z_eb, z_eg, z_eqs, z_em, z_epinf, z_ew, crhoa, crhob, crhog, crhoqs, crhoms, crhopinf, crhow, cmap, cmaw, csadjcost, csigma, chabb, cprobw, csigl, cprobp, cindw, cindp, czcap, cfc, crpi, crr, cry, crdy, constepinf, constebeta, constelab, ctrend, cgy, calfa = all_params[1:36]
     end
 
-    z_ea, z_eb, z_eg, z_eqs, z_em, z_epinf, z_ew, crhoa, crhob, crhog, crhoqs, crhoms, crhopinf, crhow, cmap, cmaw, csadjcost, csigma, chabb, cprobw, csigl, cprobp, cindw, cindp, czcap, cfc, crpi, crr, cry, crdy, constepinf, constebeta, constelab, ctrend, cgy, calfa = all_params[1:36]
 
     if priors == "original"
         ctou, clandaw, cg, curvp, curvw = fixed_parameters[1]
@@ -463,7 +464,8 @@ if geo == "EA"
             init_params = [2.5989822151536535, 0.6578044451220171, 0.9281310531821928, 1.8852968089406528, 0.8186057477776528, 1.624749728115599, 1.369464287917585, 0.41507938838632535, 0.721658080649216, 0.6664692672787901, 0.8514498174369488, 0.4890983016708977, 0.5624499122468842, 0.5414859476317512, 0.18714280089686092, 0.24684006940138484, 8.398955355725677, 1.0006070838317087, 0.12254688311712678, 0.5509201816084156, 2.195979154320753, 0.5881723445941589, 0.8508888247348659, 0.8686808809823324, 0.4526443895917511, 2.1036428455911094, 2.618645870807919, 0.5776965506871476, 0.30373468432509065, 0.0638034232215675, 1.5107565101005929, 0.8497814956065451, -6.561209938565711, 0.5803935558464064, 1.7440087116410714, 0.2280110157450484]
         end
     elseif priors == "tighter"
-            init_params = [0.7161903394789723, 0.08749581983066951, 0.5996039433611786, 1.282283599429332, 0.2813180555578314, 0.1938632278078158, 0.535527616439156, 0.9955012011469743, 0.9736726934937979, 0.8485486560603187, 0.31665842082145557, 0.5911678846344337, 0.9888442541712489, 0.8781087825830718, 0.4970929016711537, 0.7407107829286769, 5.07171257545687, 1.187419342792692, 0.4514305904508852, 0.6364952240606264, -0.31056628312627593, 0.5829677221597701, 0.6543317361772387, 0.1802331842737685, 0.8427622648028558, 1.2193463381813248, 1.9762146376177703, 0.8294582566023195, 0.021785288512891028, 0.7878594407064632, 0.3429549318049575, 15.82793242047244, 0.5784043377850486, 0.3232430722313766, 0.197878195387292, 0.01669453347964063, 3.1019814182272354, 0.1960539096241335, 12.35207983064041, 16.17879860560539]
+            # init_params = [0.7161903394789723, 0.08749581983066951, 0.5996039433611786, 1.282283599429332, 0.2813180555578314, 0.1938632278078158, 0.535527616439156, 0.9955012011469743, 0.9736726934937979, 0.8485486560603187, 0.31665842082145557, 0.5911678846344337, 0.9888442541712489, 0.8781087825830718, 0.4970929016711537, 0.7407107829286769, 5.07171257545687, 1.187419342792692, 0.4514305904508852, 0.6364952240606264, -0.31056628312627593, 0.5829677221597701, 0.6543317361772387, 0.1802331842737685, 0.8427622648028558, 1.2193463381813248, 1.9762146376177703, 0.8294582566023195, 0.021785288512891028, 0.7878594407064632, 0.3429549318049575, 15.82793242047244, 0.5784043377850486, 0.3232430722313766, 0.197878195387292, 0.01669453347964063, 3.1019814182272354, 0.1960539096241335, 12.35207983064041, 16.17879860560539]
+            init_params = [0.6078559133318278, 0.06836618238325545, 0.4203898197505046, 1.1088241818556892, 0.6541387441075293, 0.1267035923202942, 0.4528480216201151, 0.9941945010996004, 0.9900258724661307, 0.944447821651772, 0.09136974979681929, 0.5469941169752605, 0.9839879182859345, 0.8176542834158012, 0.46404242788618344, 0.7277828188461039, 6.207074468776051, 0.5342528174391462, 0.560325003881225, 0.6329231385353169, 0.8484146558715042, 0.7618268755139341, 0.7816314780804516, 0.07816721962903334, 0.817115418052766, 0.9812936465960612, 2.2188852317152006, 0.626915938550924, 0.02363305569575591, 0.4237043241955714, 0.28392007131192487, -0.7476344687461959, 0.30542058428439206, 0.5032209567712396, 0.2993769847124837, 0.034103710249185064, 4.119095036926654, 0.19636391880348672, 8.22514103090019, 14.633481496900645]
     elseif priors ∈ ["all", "open"]
         if algo ∈ [:first_order, :third_order]
             init_params = [0.7161903394789723, 0.08749581983066951, 0.5996039433611786, 1.282283599429332, 0.2813180555578314, 0.1938632278078158, 0.535527616439156, 0.9955012011469743, 0.9736726934937979, 0.8485486560603187, 0.31665842082145557, 0.5911678846344337, 0.9888442541712489, 0.8781087825830718, 0.4970929016711537, 0.7407107829286769, 5.07171257545687, 1.187419342792692, 0.4514305904508852, 0.6364952240606264, -0.31056628312627593, 0.5829677221597701, 0.6543317361772387, 0.1802331842737685, 0.8427622648028558, 1.2193463381813248, 1.9762146376177703, 0.8294582566023195, 0.021785288512891028, 0.08161103324781213, 0.7878594407064632, 0.3429549318049575, 15.82793242047244, 0.5784043377850486, 0.3232430722313766, 0.197878195387292, 0.01669453347964063, 3.1019814182272354, 0.1960539096241335, 12.35207983064041, 16.17879860560539]