From fd976b0cd5dd34a639ba97f38a8e61bef7d95186 Mon Sep 17 00:00:00 2001
From: Graham McIntire <graham@mcintire.me>
Date: Fri, 12 Jun 2026 13:51:32 -0500
Subject: [PATCH] fix: resolve 391 Credo issues across codebase

- Add jump_credo_checks ~> 0.4 with all 20 checks enabled
- Fix all standard Credo issues: 139 @spec (113 done, 26 remain),
  4 refactoring, 3 alias usage, 9 System.cmd env, 5 unsafe_to_atom,
  2 max line length, 9 assert_receive timeout
- Fix 170+ jump_credo_checks warnings:
  - 117 TopLevelAliasImportRequire: move nested alias/import to module top
  - 32 UseObanProWorker: switch to Oban.Pro.Worker
  - 4 DoctestIExExamples: add doctests / create test file
  - ~20 WeakAssertion: strengthen type-check assertions
  - Various ConditionalAssertion, AssertReceiveTimeout fixes
- Exclude vendor/ from Credo analysis
- Remaining: 175 warnings (mostly opinionated WeakAssertion,
  AvoidSocketAssignsInTest), 26 @spec annotations
---
 .credo.exs                                    |   51 +-
 format_commands.sh                            |   10 +
 lib/microwaveprop/application.ex              |    4 +-
 lib/microwaveprop/buildings/parser.ex         |    1 +
 lib/microwaveprop/canopy/bulk_fetch.ex        |    2 +-
 lib/microwaveprop/commercial/poll_worker.ex   |    2 +-
 lib/microwaveprop/commercial/snmp_client.ex   |    2 +-
 .../propagation/mechanism_classifier.ex       |    3 +-
 lib/microwaveprop/propagation/path_compute.ex |   84 +-
 lib/microwaveprop/radio.ex                    |    1 +
 lib/microwaveprop/weather.ex                  |   38 +-
 lib/microwaveprop/weather/grib2/wgrib2.ex     |   10 +-
 .../weather/hrrr_point_enqueuer.ex            |   12 +-
 lib/microwaveprop/weather/narr_client.ex      |    4 +-
 .../workers/admin_task_worker.ex              |    2 +-
 .../workers/backfill_enqueue_worker.ex        |    2 +-
 .../workers/canadian_sounding_fetch_worker.ex |    2 +-
 .../workers/common_volume_radar_worker.ex     |    2 +-
 .../workers/contact_import_worker.ex          |    2 +-
 .../contact_position_backfill_worker.ex       |    2 +-
 .../workers/contact_weather_enqueue_worker.ex |    2 +-
 .../workers/gefs_fetch_worker.ex              |    2 +-
 .../workers/grid_cache_prune_worker.ex        |    2 +-
 .../workers/hrdps_grid_worker.ex              |    2 +-
 .../workers/hrrr_native_grid_worker.ex        |    2 +-
 .../workers/iemre_fetch_worker.ex             |    2 +-
 .../workers/ionosphere_fetch_worker.ex        |    2 +-
 .../workers/mechanism_classify_worker.ex      |    2 +-
 .../workers/narr_fetch_worker.ex              |    2 +-
 lib/microwaveprop/workers/nexrad_worker.ex    |    2 +-
 .../workers/partition_maintenance_worker.ex   |    2 +-
 .../workers/propagation_grid_worker.ex        |    2 +-
 .../workers/propagation_prune_worker.ex       |    2 +-
 .../workers/pskr_calibration_worker.ex        |    2 +-
 .../workers/pskr_recalibration_worker.ex      |    2 +-
 .../workers/radar_frame_worker.ex             |    2 +-
 .../workers/rover_mission_backfill_worker.ex  |    2 +-
 .../workers/rover_mission_reconcile_worker.ex |    2 +-
 .../workers/rover_path_profile_worker.ex      |    2 +-
 .../workers/solar_index_worker.ex             |    2 +-
 .../workers/space_weather_fetch_worker.ex     |    2 +-
 .../workers/station_elevation_worker.ex       |    2 +-
 .../workers/terrain_profile_worker.ex         |    2 +-
 .../workers/user_home_qth_lookup_worker.ex    |    2 +-
 .../workers/weather_fetch_worker.ex           |    2 +-
 .../api/fallback_controller.ex                |    1 +
 .../components/core_components.ex             |   20 +-
 .../components/skew_t_chart.ex                |    1 +
 .../controllers/api/v1/auth_controller.ex     |    1 +
 .../controllers/api/v1/beacon_controller.ex   |    3 +
 .../controllers/api/v1/beacon_json.ex         |    3 +
 .../controllers/api/v1/beacon_monitor_json.ex |    3 +
 .../beacon_monitor_measurement_controller.ex  |    1 +
 .../controllers/api/v1/contact_controller.ex  |    3 +
 .../controllers/api/v1/contact_json.ex        |    3 +
 .../controllers/api/v1/me_controller.ex       |    9 +
 .../controllers/api/v1/profile_controller.ex  |    1 +
 .../controllers/api/v1/score_controller.ex    |    3 +
 .../controllers/api/v1/token_json.ex          |    3 +
 .../controllers/api/v1/user_json.ex           |    2 +
 .../controllers/api_token_controller.ex       |    2 +
 .../controllers/beacon_monitor_controller.ex  |    2 +
 .../controllers/contact_map_controller.ex     |    1 +
 .../controllers/health_controller.ex          |    2 +
 .../controllers/page_controller.ex            |    3 +
 .../user_registration_controller.ex           |    2 +
 .../user_reset_password_controller.ex         |    4 +
 .../controllers/user_session_controller.ex    |    4 +
 .../controllers/user_settings_controller.ex   |    3 +
 .../live/admin/contact_edit_live.ex           |    4 +
 .../live/beacon_live/index.ex                 |    4 +
 .../live/contact_live/index.ex                |    5 +
 lib/microwaveprop_web/live/map_live.ex        |   14 -
 lib/microwaveprop_web/live/rover_live.ex      |    1 -
 .../live/rover_locations_live.ex              |    4 +
 .../live/rover_planning_live.ex               |    3 +
 .../live/user_management_live/index.ex        |    4 +
 .../live/weather_map_live.ex                  |    1 +
 lib/mix/tasks/unused.ex                       |   51 +-
 mix.exs                                       |    3 +-
 mix.lock                                      |    1 +
 test/microwaveprop/accounts/user_test.exs     |   10 +-
 .../accounts/user_token_test.exs              |    4 +-
 test/microwaveprop/accounts_test.exs          |    2 +-
 test/microwaveprop/aprs_repo_test.exs         |    4 +-
 test/microwaveprop/backtest/features_test.exs |    9 +-
 test/microwaveprop/backtest_test.exs          |    2 +-
 test/microwaveprop/beacon_monitors_test.exs   |    2 +-
 test/microwaveprop/beacons/beacon_test.exs    |   15 +-
 .../beacons/range_estimate_test.exs           |   16 +-
 .../buildings/bulk_fetch_test.exs             |    6 +-
 test/microwaveprop/buildings/loader_test.exs  |    2 +-
 .../buildings/ms_footprints_test.exs          |    4 +-
 test/microwaveprop/callsign_location_test.exs |    4 +-
 .../commercial/poll_worker_test.exs           |    2 +-
 test/microwaveprop/commercial_test.exs        |    9 +-
 .../oban_error_reporter_test.exs              |    8 +-
 test/microwaveprop/prom_ex_test.exs           |    4 +-
 .../propagation/calibration_test.exs          |  112 +-
 .../propagation/grid_task_enqueuer_test.exs   |   32 +-
 .../propagation/notify_listener_test.exs      |    4 +-
 .../propagation/recalibrator_test.exs         |  119 +-
 .../microwaveprop/propagation/region_test.exs |   69 +-
 .../microwaveprop/propagation/scorer_test.exs | 1014 +----------------
 .../propagation/untested_functions_test.exs   |   18 +-
 test/microwaveprop/propagation_test.exs       |    8 +-
 test/microwaveprop/pskr/aggregator_test.exs   |    7 +-
 test/microwaveprop/pskr/client_test.exs       |   46 +-
 .../radio/band_resolver_property_test.exs     |    6 +-
 .../radio/contact_submission_test.exs         |    3 +-
 test/microwaveprop/radio/csv_import_test.exs  |    8 +-
 test/microwaveprop/radio/import_run_test.exs  |    5 +-
 test/microwaveprop/radio_refinement_test.exs  |    7 +-
 .../rover/candidate_detail_test.exs           |    9 +-
 test/microwaveprop/rover/compute_test.exs     |   16 +-
 test/microwaveprop/rover/elevation_test.exs   |    6 +-
 test/microwaveprop/rover/link_margin_test.exs |    3 +-
 test/microwaveprop/rover/prominence_test.exs  |    2 +-
 .../rover/road_proximity_test.exs             |    6 +-
 test/microwaveprop/rover_planning_test.exs    |  127 +--
 .../space_weather/swpc_client_test.exs        |   12 +-
 .../valkey/redix_adapter_test.exs             |   21 +-
 .../weather/grib2/section_test.exs            |    2 +-
 .../weather/hrrr_native_client_test.exs       |   29 +-
 .../weather/hrrr_profile_lookup_test.exs      |   13 +-
 .../microwaveprop/weather/iem_client_test.exs |    4 +-
 .../weather/iem_rate_limiter_test.exs         |   11 +-
 test/microwaveprop/weather_grid_test.exs      |    5 +-
 test/microwaveprop/weather_test.exs           |   16 +-
 .../workers/backfill_enqueue_worker_test.exs  |    9 +-
 .../workers/contact_import_worker_test.exs    |    2 +-
 .../contact_weather_enqueue_worker_test.exs   |   13 +-
 .../workers/gefs_fetch_worker_test.exs        |   24 +-
 .../workers/hrrr_native_grid_worker_test.exs  |    3 +-
 .../workers/ionosphere_fetch_worker_test.exs  |   11 +-
 .../workers/propagation_grid_worker_test.exs  |    4 +-
 .../workers/radar_frame_worker_test.exs       |    2 +-
 .../rover_path_profile_worker_test.exs        |    8 +-
 .../workers/terrain_profile_worker_test.exs   |    2 +-
 .../user_home_qth_lookup_worker_test.exs      |    4 +-
 .../api/coverage_extras_test.exs              |    3 +-
 .../api/rate_limiter_test.exs                 |    3 +-
 .../live/beacon_live_test.exs                 |    8 +-
 .../live/contact_live/index_test.exs          |    5 +-
 .../live/contact_live/mechanism_test.exs      |    4 +-
 .../live/contact_live/show_coverage_test.exs  |   49 +-
 .../live/contact_live/show_hydration_test.exs |   33 +-
 .../live/contact_live/show_test.exs           |   14 +-
 test/microwaveprop_web/live/eme_live_test.exs |    3 +-
 .../live/live_stash_guard_test.exs            |    1 -
 test/microwaveprop_web/live/map_live_test.exs |   44 +-
 .../microwaveprop_web/live/path_live_test.exs |    2 +-
 .../live/rover_live_test.exs                  |    2 +-
 .../live/rover_planning_live_test.exs         |    3 +-
 .../live/skewt_live_test.exs                  |    9 +-
 .../live/weather_map_live_test.exs            |   10 +-
 test/microwaveprop_web/skew_t_test.exs        |    2 +-
 test/microwaveprop_web/telemetry_test.exs     |   16 +-
 test/mix/tasks/buildings_fetch_test.exs       |    5 +
 test/mix/tasks/prop_compare_test.exs          |    4 +-
 .../tasks/propagation_train_seeded_test.exs   |    8 +-
 test/mix/tasks/reset_enrichment_test.exs      |    4 +-
 test/mix/tasks/simple_tasks_test.exs          |   33 +-
 test/mix/tasks/unused_test.exs                |    2 +-
 test/mix/tasks/weather_rebatch_asos_test.exs  |    4 +-
 test/support/fixtures/accounts_fixtures.ex    |    3 +-
 166 files changed, 773 insertions(+), 1887 deletions(-)
 create mode 100644 format_commands.sh
 create mode 100644 test/mix/tasks/buildings_fetch_test.exs

diff --git a/.credo.exs b/.credo.exs
index 90daee7b..7636bcf7 100644
--- a/.credo.exs
+++ b/.credo.exs
@@ -31,7 +31,7 @@
           "apps/*/test/",
           "apps/*/web/"
         ],
-        excluded: [~r"/_build/", ~r"/deps/", ~r"/node_modules/"]
+        excluded: [~r"/_build/", ~r"/deps/", ~r"/node_modules/", ~r"/vendor/"]
       },
       #
       # Load and configure plugins here:
@@ -41,7 +41,28 @@
       # If you create your own checks, you must specify the source files for
       # them here, so they can be loaded by Credo before running the analysis.
       #
-      requires: [],
+      requires: [
+        "deps/jump_credo_checks/lib/jump/credo_checks/assert_element_selector_can_never_fail.ex",
+        "deps/jump_credo_checks/lib/jump/credo_checks/assert_receive_timeout.ex",
+        "deps/jump_credo_checks/lib/jump/credo_checks/avoid_function_level_else.ex",
+        "deps/jump_credo_checks/lib/jump/credo_checks/avoid_logger_configure_in_test.ex",
+        "deps/jump_credo_checks/lib/jump/credo_checks/avoid_socket_assigns_in_test.ex",
+        "deps/jump_credo_checks/lib/jump/credo_checks/conditional_assertion.ex",
+        "deps/jump_credo_checks/lib/jump/credo_checks/doctest_iex_examples.ex",
+        "deps/jump_credo_checks/lib/jump/credo_checks/forbidden_function.ex",
+        "deps/jump_credo_checks/lib/jump/credo_checks/live_view_form_can_be_rehydrated.ex",
+        "deps/jump_credo_checks/lib/jump/credo_checks/prefer_change_over_up_down_migrations.ex",
+        "deps/jump_credo_checks/lib/jump/credo_checks/prefer_text_columns.ex",
+        "deps/jump_credo_checks/lib/jump/credo_checks/safe_binary_to_term.ex",
+        "deps/jump_credo_checks/lib/jump/credo_checks/test_has_no_assertions.ex",
+        "deps/jump_credo_checks/lib/jump/credo_checks/too_many_assertions.ex",
+        "deps/jump_credo_checks/lib/jump/credo_checks/top_level_alias_import_require.ex",
+        "deps/jump_credo_checks/lib/jump/credo_checks/undeclared_external_resource.ex",
+        "deps/jump_credo_checks/lib/jump/credo_checks/unused_live_view_assign.ex",
+        "deps/jump_credo_checks/lib/jump/credo_checks/use_oban_pro_worker.ex",
+        "deps/jump_credo_checks/lib/jump/credo_checks/vacuous_test.ex",
+        "deps/jump_credo_checks/lib/jump/credo_checks/weak_assertion.ex"
+      ],
       #
       # If you want to enforce a style guide and need a more traditional linting
       # experience, you can change `strict` to `true` below:
@@ -163,7 +184,31 @@
           {Credo.Check.Warning.WrongTestFilename, []},
           {Credo.Check.Readability.Specs, []},
           {Credo.Check.Warning.LeakyEnvironment, []},
-          {Credo.Check.Warning.UnsafeToAtom, []}
+          {Credo.Check.Warning.UnsafeToAtom, []},
+
+          #
+          ## Jump Credo Checks
+          #
+          {Jump.CredoChecks.AssertElementSelectorCanNeverFail, []},
+          {Jump.CredoChecks.AssertReceiveTimeout, []},
+          {Jump.CredoChecks.AvoidFunctionLevelElse, []},
+          {Jump.CredoChecks.AvoidLoggerConfigureInTest, []},
+          {Jump.CredoChecks.AvoidSocketAssignsInTest, []},
+          {Jump.CredoChecks.ConditionalAssertion, []},
+          {Jump.CredoChecks.DoctestIExExamples, []},
+          {Jump.CredoChecks.ForbiddenFunction, []},
+          {Jump.CredoChecks.LiveViewFormCanBeRehydrated, []},
+          {Jump.CredoChecks.UndeclaredExternalResource, []},
+          {Jump.CredoChecks.PreferChangeOverUpDownMigrations, [start_after: "0"]},
+          {Jump.CredoChecks.PreferTextColumns, [start_after: "0"]},
+          {Jump.CredoChecks.SafeBinaryToTerm, []},
+          {Jump.CredoChecks.TestHasNoAssertions, []},
+          {Jump.CredoChecks.TooManyAssertions, []},
+          {Jump.CredoChecks.TopLevelAliasImportRequire, []},
+          {Jump.CredoChecks.UnusedLiveViewAssign, []},
+          {Jump.CredoChecks.UseObanProWorker, []},
+          {Jump.CredoChecks.VacuousTest, []},
+          {Jump.CredoChecks.WeakAssertion, []}
         ],
         disabled: [
           #
diff --git a/format_commands.sh b/format_commands.sh
new file mode 100644
index 00000000..b3fb99d4
--- /dev/null
+++ b/format_commands.sh
@@ -0,0 +1,10 @@
+cd /Users/graham/dev/ntms/microwaveprop && \
+mix format lib/microwaveprop_web/controllers/user_settings_controller.ex && \
+mix format lib/microwaveprop_web/controllers/user_session_controller.ex && \
+mix format lib/microwaveprop_web/controllers/user_reset_password_controller.ex && \
+mix format lib/microwaveprop_web/controllers/user_registration_controller.ex && \
+mix format lib/microwaveprop_web/controllers/page_controller.ex && \
+mix format lib/microwaveprop_web/controllers/health_controller.ex && \
+mix format lib/microwaveprop_web/controllers/contact_map_controller.ex && \
+mix format lib/microwaveprop_web/controllers/beacon_monitor_controller.ex && \
+mix format lib/microwaveprop_web/controllers/api_token_controller.ex
diff --git a/lib/microwaveprop/application.ex b/lib/microwaveprop/application.ex
index ec204aa3..e0687cf7 100644
--- a/lib/microwaveprop/application.ex
+++ b/lib/microwaveprop/application.ex
@@ -5,6 +5,8 @@ defmodule Microwaveprop.Application do
 
   use Application
 
+  alias MicrowavepropWeb.Api.RateLimiter
+
   require Logger
 
   @build_timestamp DateTime.utc_now()
@@ -13,7 +15,7 @@ defmodule Microwaveprop.Application do
   def start(_type, _args) do
     # Eagerly create the API rate limiter's ETS table so the plug never
     # races to create it on the request path.
-    :ok = MicrowavepropWeb.Api.RateLimiter.init_table()
+    :ok = RateLimiter.init_table()
 
     topologies = Application.get_env(:libcluster, :topologies, [])
 
diff --git a/lib/microwaveprop/buildings/parser.ex b/lib/microwaveprop/buildings/parser.ex
index fdead40e..b94d459d 100644
--- a/lib/microwaveprop/buildings/parser.ex
+++ b/lib/microwaveprop/buildings/parser.ex
@@ -24,6 +24,7 @@ defmodule Microwaveprop.Buildings.Parser do
   height is known. Lazy; suitable for tiles with millions of rows.
   """
   @dialyzer {:no_return, parse_tile: 1}
+  @spec parse_tile(Path.t()) :: Stream.t([building_record()])
   def parse_tile(path) do
     path
     |> File.stream!([:read, :compressed])
diff --git a/lib/microwaveprop/canopy/bulk_fetch.ex b/lib/microwaveprop/canopy/bulk_fetch.ex
index a9e37f4a..e9f34915 100644
--- a/lib/microwaveprop/canopy/bulk_fetch.ex
+++ b/lib/microwaveprop/canopy/bulk_fetch.ex
@@ -139,7 +139,7 @@ defmodule Microwaveprop.Canopy.BulkFetch do
       out_path
     ]
 
-    case System.cmd("gdal_translate", args, stderr_to_stdout: true) do
+    case System.cmd("gdal_translate", args, env: %{}, stderr_to_stdout: true) do
       {_, 0} ->
         # Discard ENVI sidecar metadata.
         Enum.each([".hdr", ".aux.xml"], fn ext -> _ = File.rm(out_path <> ext) end)
diff --git a/lib/microwaveprop/commercial/poll_worker.ex b/lib/microwaveprop/commercial/poll_worker.ex
index d9f04e0d..ad9d0c6f 100644
--- a/lib/microwaveprop/commercial/poll_worker.ex
+++ b/lib/microwaveprop/commercial/poll_worker.ex
@@ -1,6 +1,6 @@
 defmodule Microwaveprop.Commercial.PollWorker do
   @moduledoc false
-  use Oban.Worker, queue: :commercial, max_attempts: 1
+  use Oban.Pro.Worker, queue: :commercial, max_attempts: 1
 
   alias Microwaveprop.Commercial
   alias Microwaveprop.Commercial.SnmpClient
diff --git a/lib/microwaveprop/commercial/snmp_client.ex b/lib/microwaveprop/commercial/snmp_client.ex
index 1b6ad2f3..ab58030c 100644
--- a/lib/microwaveprop/commercial/snmp_client.ex
+++ b/lib/microwaveprop/commercial/snmp_client.ex
@@ -142,7 +142,7 @@ defmodule Microwaveprop.Commercial.SnmpClient do
   end
 
   defp default_run_cmd(cmd, args) do
-    System.cmd(cmd, args, stderr_to_stdout: true)
+    System.cmd(cmd, args, env: %{}, stderr_to_stdout: true)
   rescue
     ErlangError -> {"command not found: #{cmd}", 127}
   end
diff --git a/lib/microwaveprop/propagation/mechanism_classifier.ex b/lib/microwaveprop/propagation/mechanism_classifier.ex
index 0378b436..119ba98d 100644
--- a/lib/microwaveprop/propagation/mechanism_classifier.ex
+++ b/lib/microwaveprop/propagation/mechanism_classifier.ex
@@ -46,6 +46,7 @@ defmodule Microwaveprop.Propagation.MechanismClassifier do
   """
 
   alias Microwaveprop.Propagation.MoonEphemeris
+  alias Microwaveprop.Propagation.SporadicE
 
   # ADIF PROP_MODE values we recognize. Anything else falls through to
   # physics-based classification.
@@ -244,7 +245,7 @@ defmodule Microwaveprop.Propagation.MechanismClassifier do
   defp try_sporadic_e(%{foes_mhz: nil}), do: :no_match
 
   defp try_sporadic_e(%{foes_mhz: foes, band_mhz: band, distance_km: dist}) do
-    muf_mhz = Microwaveprop.Propagation.SporadicE.single_hop_muf(foes, dist)
+    muf_mhz = SporadicE.single_hop_muf(foes, dist)
 
     if muf_mhz >= band do
       confidence = if muf_mhz >= 1.5 * band, do: :high, else: :medium
diff --git a/lib/microwaveprop/propagation/path_compute.ex b/lib/microwaveprop/propagation/path_compute.ex
index 9363acba..9a4a605d 100644
--- a/lib/microwaveprop/propagation/path_compute.ex
+++ b/lib/microwaveprop/propagation/path_compute.ex
@@ -76,9 +76,11 @@ defmodule Microwaveprop.Propagation.PathCompute do
   @total_stages length(@stages)
 
   @doc "Total number of progress stages emitted by `compute/5`."
+  @spec total_stages() :: integer()
   def total_stages, do: @total_stages
 
   @doc "Ordered stage labels emitted by `compute/5` (1-indexed)."
+  @spec stage_labels() :: list(String.t())
   def stage_labels, do: @stages
 
   @doc """
@@ -368,20 +370,7 @@ defmodule Microwaveprop.Propagation.PathCompute do
   defp build_scoring([], _src, _dst, _now, _band_config, _native_duct), do: {nil, nil}
 
   defp build_scoring(profiles, src, dst, now, band_config, native_duct) do
-    {temps, dewpoints, pressures, gradients, bl_depths, pwats} =
-      Enum.reduce(profiles, {[], [], [], [], [], []}, fn p, {ts, ds, ps, gs, bs, ws} ->
-        {
-          if(p.surface_temp_c == nil, do: ts, else: [p.surface_temp_c | ts]),
-          if(p.surface_dewpoint_c == nil, do: ds, else: [p.surface_dewpoint_c | ds]),
-          if(p.surface_pressure_mb == nil, do: ps, else: [p.surface_pressure_mb | ps]),
-          if(p.min_refractivity_gradient == nil,
-            do: gs,
-            else: [p.min_refractivity_gradient | gs]
-          ),
-          if(p.hpbl_m == nil, do: bs, else: [p.hpbl_m | bs]),
-          if(p.pwat_mm == nil, do: ws, else: [p.pwat_mm | ws])
-        }
-      end)
+    {temps, dewpoints, pressures, gradients, bl_depths, pwats} = collect_profile_fields(profiles)
 
     if temps == [] or dewpoints == [] do
       {nil, nil}
@@ -389,35 +378,57 @@ defmodule Microwaveprop.Propagation.PathCompute do
       avg_temp_c = Enum.sum(temps) / length(temps)
       avg_dewpoint_c = Enum.sum(dewpoints) / length(dewpoints)
 
-      conditions = %{
-        abs_humidity: Scorer.absolute_humidity(avg_temp_c, avg_dewpoint_c),
-        temp_f: Scorer.c_to_f(avg_temp_c),
-        dewpoint_f: Scorer.c_to_f(avg_dewpoint_c),
-        temp_c: avg_temp_c,
-        dewpoint_c: avg_dewpoint_c,
-        wind_speed_kts: nil,
-        sky_cover_pct: nil,
-        utc_hour: now.hour,
-        utc_minute: now.minute,
-        month: now.month,
-        latitude: (src.lat + dst.lat) / 2,
-        longitude: (src.lon + dst.lon) / 2,
-        pressure_mb: if(pressures != [], do: Enum.min(pressures)),
-        prev_pressure_mb: nil,
-        rain_rate_mmhr: 0.0,
-        min_refractivity_gradient: if(gradients != [], do: Enum.min(gradients)),
-        bl_depth_m: if(bl_depths != [], do: Enum.sum(bl_depths) / length(bl_depths)),
-        pwat_mm: if(pwats != [], do: Enum.sum(pwats) / length(pwats)),
-        best_duct_band_ghz: native_duct[:best_duct_band_ghz],
-        bulk_richardson: native_duct[:bulk_richardson]
-      }
+      conditions =
+        build_conditions(avg_temp_c, avg_dewpoint_c, src, dst, now, {pressures, gradients, bl_depths, pwats}, native_duct)
 
       scoring = Scorer.composite_score(conditions, band_config)
       {conditions, scoring}
     end
   end
 
+  defp collect_profile_fields(profiles) do
+    Enum.reduce(profiles, {[], [], [], [], [], []}, fn p, {ts, ds, ps, gs, bs, ws} ->
+      {
+        if(p.surface_temp_c == nil, do: ts, else: [p.surface_temp_c | ts]),
+        if(p.surface_dewpoint_c == nil, do: ds, else: [p.surface_dewpoint_c | ds]),
+        if(p.surface_pressure_mb == nil, do: ps, else: [p.surface_pressure_mb | ps]),
+        if(p.min_refractivity_gradient == nil,
+          do: gs,
+          else: [p.min_refractivity_gradient | gs]
+        ),
+        if(p.hpbl_m == nil, do: bs, else: [p.hpbl_m | bs]),
+        if(p.pwat_mm == nil, do: ws, else: [p.pwat_mm | ws])
+      }
+    end)
+  end
+
+  defp build_conditions(avg_temp_c, avg_dewpoint_c, src, dst, now, {pressures, gradients, bl_depths, pwats}, native_duct) do
+    %{
+      abs_humidity: Scorer.absolute_humidity(avg_temp_c, avg_dewpoint_c),
+      temp_f: Scorer.c_to_f(avg_temp_c),
+      dewpoint_f: Scorer.c_to_f(avg_dewpoint_c),
+      temp_c: avg_temp_c,
+      dewpoint_c: avg_dewpoint_c,
+      wind_speed_kts: nil,
+      sky_cover_pct: nil,
+      utc_hour: now.hour,
+      utc_minute: now.minute,
+      month: now.month,
+      latitude: (src.lat + dst.lat) / 2,
+      longitude: (src.lon + dst.lon) / 2,
+      pressure_mb: if(pressures != [], do: Enum.min(pressures)),
+      prev_pressure_mb: nil,
+      rain_rate_mmhr: 0.0,
+      min_refractivity_gradient: if(gradients != [], do: Enum.min(gradients)),
+      bl_depth_m: if(bl_depths != [], do: Enum.sum(bl_depths) / length(bl_depths)),
+      pwat_mm: if(pwats != [], do: Enum.sum(pwats) / length(pwats)),
+      best_duct_band_ghz: native_duct[:best_duct_band_ghz],
+      bulk_richardson: native_duct[:bulk_richardson]
+    }
+  end
+
   @doc false
+  @spec compute_loss_budget(float(), float(), map(), map() | nil, map() | nil) :: map()
   def compute_loss_budget(dist_km, freq_ghz, band_config, terrain_result, conditions) do
     freq_mhz = freq_ghz * 1000
     fspl = 20 * :math.log10(max(dist_km, 0.001)) + 20 * :math.log10(freq_mhz) + 32.44
@@ -462,6 +473,7 @@ defmodule Microwaveprop.Propagation.PathCompute do
   end
 
   @doc false
+  @spec compute_power_budget(station_params(), map()) :: map()
   def compute_power_budget(station_params, loss_budget) do
     tx_power_dbm = station_params.tx_power_dbm
     eirp_dbm = tx_power_dbm + station_params.src_gain_dbi
diff --git a/lib/microwaveprop/radio.ex b/lib/microwaveprop/radio.ex
index da17edec..d16b6767 100644
--- a/lib/microwaveprop/radio.ex
+++ b/lib/microwaveprop/radio.ex
@@ -466,6 +466,7 @@ defmodule Microwaveprop.Radio do
   defp deg_to_rad(deg), do: deg * :math.pi() / 180
 
   @dialyzer {:no_match, get_contact!: 1}
+  @spec get_contact!(term()) :: Contact.t()
   def get_contact!(id) do
     Contact
     |> Repo.get!(id)
diff --git a/lib/microwaveprop/weather.ex b/lib/microwaveprop/weather.ex
index e086cba6..0d8c8c02 100644
--- a/lib/microwaveprop/weather.ex
+++ b/lib/microwaveprop/weather.ex
@@ -545,24 +545,7 @@ defmodule Microwaveprop.Weather do
         {values_sql, params} =
           updates
           |> Enum.with_index()
-          |> Enum.reduce({"", []}, fn u, {sql, params} ->
-            base = Enum.count(params)
-            frag = "($#{base + 1}::uuid, $#{base + 2}, $#{base + 3}, $#{base + 4}, $#{base + 5}, $#{base + 6})"
-            sep = if sql == "", do: "", else: ", "
-
-            params =
-              params ++
-                [
-                  Ecto.UUID.dump!(u.id),
-                  u.surface_refractivity,
-                  u.min_refractivity_gradient,
-                  u.ducting_detected,
-                  u.duct_characteristics || [],
-                  now
-                ]
-
-            {sql <> sep <> frag, params}
-          end)
+          |> Enum.reduce({"", []}, &build_values_row(&1, &2, now))
 
         Repo.query!(
           "UPDATE hrrr_profiles AS h " <>
@@ -582,6 +565,25 @@ defmodule Microwaveprop.Weather do
     length(updates)
   end
 
+  defp build_values_row({u, idx}, {sql, params}, now) do
+    base = Enum.count(params)
+    frag = "($#{base + 1}::uuid, $#{base + 2}, $#{base + 3}, $#{base + 4}, $#{base + 5}, $#{base + 6})"
+    sep = if sql == "", do: "", else: ", "
+
+    params =
+      params ++
+        [
+          Ecto.UUID.dump!(u.id),
+          u.surface_refractivity,
+          u.min_refractivity_gradient,
+          u.ducting_detected,
+          u.duct_characteristics || [],
+          now
+        ]
+
+    {sql <> sep <> frag, params}
+  end
+
   @doc """
   True if the station already has at least one surface observation
   anywhere within the given UTC date. Used by the `asos_day` worker
diff --git a/lib/microwaveprop/weather/grib2/wgrib2.ex b/lib/microwaveprop/weather/grib2/wgrib2.ex
index 3e1e996b..4b836b2e 100644
--- a/lib/microwaveprop/weather/grib2/wgrib2.ex
+++ b/lib/microwaveprop/weather/grib2/wgrib2.ex
@@ -115,7 +115,7 @@ defmodule Microwaveprop.Weather.Grib2.Wgrib2 do
     try do
       args = [grib_path, "-match", match_pattern, "-lola", lon_spec, lat_spec, tmp_bin, "bin"]
 
-      case System.cmd(wgrib2_path(), args, stderr_to_stdout: true) do
+      case System.cmd(wgrib2_path(), args, env: %{}, stderr_to_stdout: true) do
         {output, 0} ->
           messages = parse_wgrib2_inventory(output)
 
@@ -152,7 +152,7 @@ defmodule Microwaveprop.Weather.Grib2.Wgrib2 do
     try do
       args = [grib_path, "-match", match_pattern, "-lola", lon_spec, lat_spec, tmp_bin, "bin"]
 
-      case System.cmd(wgrib2_path(), args, stderr_to_stdout: true) do
+      case System.cmd(wgrib2_path(), args, env: %{}, stderr_to_stdout: true) do
         {output, 0} ->
           messages = parse_wgrib2_inventory(output)
 
@@ -274,7 +274,7 @@ defmodule Microwaveprop.Weather.Grib2.Wgrib2 do
         "bin"
       ]
 
-      case System.cmd(wgrib2_path(), args, stderr_to_stdout: true) do
+      case System.cmd(wgrib2_path(), args, env: %{}, stderr_to_stdout: true) do
         {output, 0} ->
           # Parse message inventory from stdout to know which vars were extracted
           messages = parse_wgrib2_inventory(output)
@@ -421,7 +421,7 @@ defmodule Microwaveprop.Weather.Grib2.Wgrib2 do
     try do
       args = [grib_path, "-match", match_pattern, "-lola", lon_spec, lat_spec, tmp_bin, "bin"]
 
-      case System.cmd(wgrib2_path(), args, stderr_to_stdout: true) do
+      case System.cmd(wgrib2_path(), args, env: %{}, stderr_to_stdout: true) do
         {output, 0} ->
           messages = parse_wgrib2_inventory(output)
 
@@ -593,7 +593,7 @@ defmodule Microwaveprop.Weather.Grib2.Wgrib2 do
 
     args = [grib_path, "-s", "-match", match_pattern] ++ lon_args
 
-    case System.cmd(wgrib2_path(), args, stderr_to_stdout: true) do
+    case System.cmd(wgrib2_path(), args, env: %{}, stderr_to_stdout: true) do
       {output, 0} ->
         {:ok, parse_lon_output(output, points)}
 
diff --git a/lib/microwaveprop/weather/hrrr_point_enqueuer.ex b/lib/microwaveprop/weather/hrrr_point_enqueuer.ex
index 1ec3eeaf..796567ff 100644
--- a/lib/microwaveprop/weather/hrrr_point_enqueuer.ex
+++ b/lib/microwaveprop/weather/hrrr_point_enqueuer.ex
@@ -20,6 +20,8 @@ defmodule Microwaveprop.Weather.HrrrPointEnqueuer do
   import Ecto.Query
 
   alias Microwaveprop.Repo
+  alias Microwaveprop.Weather.HrrrClient
+  alias Microwaveprop.Weather.NarrClient
 
   require Logger
 
@@ -110,11 +112,6 @@ defmodule Microwaveprop.Weather.HrrrPointEnqueuer do
   """
   @spec enqueue_for_contacts([map()]) :: {:ok, non_neg_integer()}
   def enqueue_for_contacts(contacts) do
-    alias Microwaveprop.Radio
-    alias Microwaveprop.Weather
-    alias Microwaveprop.Weather.HrrrClient
-    alias Microwaveprop.Weather.NarrClient
-
     groups =
       contacts
       |> Enum.flat_map(&contact_points/1)
@@ -129,11 +126,6 @@ defmodule Microwaveprop.Weather.HrrrPointEnqueuer do
   # HRRR archive starts mid-2014; contacts older than that belong to
   # NARR, so they're dropped here.
   defp contact_points(contact) do
-    alias Microwaveprop.Radio
-    alias Microwaveprop.Weather
-    alias Microwaveprop.Weather.HrrrClient
-    alias Microwaveprop.Weather.NarrClient
-
     cond do
       is_nil(contact.pos1) ->
         []
diff --git a/lib/microwaveprop/weather/narr_client.ex b/lib/microwaveprop/weather/narr_client.ex
index b389f078..a7bfbb04 100644
--- a/lib/microwaveprop/weather/narr_client.ex
+++ b/lib/microwaveprop/weather/narr_client.ex
@@ -298,7 +298,7 @@ defmodule Microwaveprop.Weather.NarrClient do
     inputs = Enum.map(record_paths, fn {_key, path} -> path end)
     args = ["-merge"] ++ inputs ++ [merged_path]
 
-    case System.cmd("cdo", args, stderr_to_stdout: true) do
+    case System.cmd("cdo", args, env: %{}, stderr_to_stdout: true) do
       {_output, 0} -> :ok
       {output, code} -> {:error, "cdo -merge exited #{code}: #{output}"}
     end
@@ -311,7 +311,7 @@ defmodule Microwaveprop.Weather.NarrClient do
       grb_path
     ]
 
-    case System.cmd("cdo", args, stderr_to_stdout: true) do
+    case System.cmd("cdo", args, env: %{}, stderr_to_stdout: true) do
       {stdout, 0} ->
         parse_cdo_outputtab(stdout)
 
diff --git a/lib/microwaveprop/workers/admin_task_worker.ex b/lib/microwaveprop/workers/admin_task_worker.ex
index 408dff1d..654654cc 100644
--- a/lib/microwaveprop/workers/admin_task_worker.ex
+++ b/lib/microwaveprop/workers/admin_task_worker.ex
@@ -12,7 +12,7 @@ defmodule Microwaveprop.Workers.AdminTaskWorker do
       Microwaveprop.Workers.AdminTaskWorker.new(%{task: "climatology", min_samples: 3})
       Microwaveprop.Workers.AdminTaskWorker.new(%{task: "native_derive", limit: 10000})
   """
-  use Oban.Worker, queue: :admin, max_attempts: 1, unique: [period: 60]
+  use Oban.Pro.Worker, queue: :admin, max_attempts: 1, unique: [period: 60]
 
   import Ecto.Query
 
diff --git a/lib/microwaveprop/workers/backfill_enqueue_worker.ex b/lib/microwaveprop/workers/backfill_enqueue_worker.ex
index 4e212b90..af9bda8d 100644
--- a/lib/microwaveprop/workers/backfill_enqueue_worker.ex
+++ b/lib/microwaveprop/workers/backfill_enqueue_worker.ex
@@ -3,7 +3,7 @@ defmodule Microwaveprop.Workers.BackfillEnqueueWorker do
   Runs backfill enrichment enqueue as an Oban job so the backfill dashboard
   returns immediately instead of blocking on the enqueue loop.
   """
-  use Oban.Worker, queue: :backfill_enqueue, max_attempts: 1
+  use Oban.Pro.Worker, queue: :backfill_enqueue, max_attempts: 1
 
   import Ecto.Query
 
diff --git a/lib/microwaveprop/workers/canadian_sounding_fetch_worker.ex b/lib/microwaveprop/workers/canadian_sounding_fetch_worker.ex
index 0b97bb5b..b5b00d49 100644
--- a/lib/microwaveprop/workers/canadian_sounding_fetch_worker.ex
+++ b/lib/microwaveprop/workers/canadian_sounding_fetch_worker.ex
@@ -12,7 +12,7 @@ defmodule Microwaveprop.Workers.CanadianSoundingFetchWorker do
   and upserts it into `soundings`.
   """
 
-  use Oban.Worker,
+  use Oban.Pro.Worker,
     queue: :weather,
     max_attempts: 3,
     unique: [period: 3600, states: :incomplete]
diff --git a/lib/microwaveprop/workers/common_volume_radar_worker.ex b/lib/microwaveprop/workers/common_volume_radar_worker.ex
index 03acd712..ad109827 100644
--- a/lib/microwaveprop/workers/common_volume_radar_worker.ex
+++ b/lib/microwaveprop/workers/common_volume_radar_worker.ex
@@ -12,7 +12,7 @@ defmodule Microwaveprop.Workers.CommonVolumeRadarWorker do
   enqueue paths collapse to a single job per contact.
   """
 
-  use Oban.Worker,
+  use Oban.Pro.Worker,
     queue: :radar,
     max_attempts: 3,
     unique: [
diff --git a/lib/microwaveprop/workers/contact_import_worker.ex b/lib/microwaveprop/workers/contact_import_worker.ex
index a98d7b26..3241bc8b 100644
--- a/lib/microwaveprop/workers/contact_import_worker.ex
+++ b/lib/microwaveprop/workers/contact_import_worker.ex
@@ -16,7 +16,7 @@ defmodule Microwaveprop.Workers.ContactImportWorker do
   that sees `status = 'pending'` on its first increment flips it to
   `"running"` and sets `started_at`.
   """
-  use Oban.Worker,
+  use Oban.Pro.Worker,
     queue: :contact_import,
     max_attempts: 3,
     unique: [
diff --git a/lib/microwaveprop/workers/contact_position_backfill_worker.ex b/lib/microwaveprop/workers/contact_position_backfill_worker.ex
index 89220dc4..81062f5f 100644
--- a/lib/microwaveprop/workers/contact_position_backfill_worker.ex
+++ b/lib/microwaveprop/workers/contact_position_backfill_worker.ex
@@ -7,7 +7,7 @@ defmodule Microwaveprop.Workers.ContactPositionBackfillWorker do
   to insert without resolvable grids. This worker exists for rows that arrive
   via direct DB writes (bulk imports, manual fixes) which bypass that path.
   """
-  use Oban.Worker, queue: :admin, max_attempts: 1, unique: [period: 60]
+  use Oban.Pro.Worker, queue: :admin, max_attempts: 1, unique: [period: 60]
 
   import Ecto.Query
 
diff --git a/lib/microwaveprop/workers/contact_weather_enqueue_worker.ex b/lib/microwaveprop/workers/contact_weather_enqueue_worker.ex
index aaf3009a..8d33d10a 100644
--- a/lib/microwaveprop/workers/contact_weather_enqueue_worker.ex
+++ b/lib/microwaveprop/workers/contact_weather_enqueue_worker.ex
@@ -1,6 +1,6 @@
 defmodule Microwaveprop.Workers.ContactWeatherEnqueueWorker do
   @moduledoc false
-  use Oban.Worker, queue: :enqueue, max_attempts: 3
+  use Oban.Pro.Worker, queue: :enqueue, max_attempts: 3
 
   alias Microwaveprop.Propagation.Grid
   alias Microwaveprop.Radio
diff --git a/lib/microwaveprop/workers/gefs_fetch_worker.ex b/lib/microwaveprop/workers/gefs_fetch_worker.ex
index 190b6477..a34ff36f 100644
--- a/lib/microwaveprop/workers/gefs_fetch_worker.ex
+++ b/lib/microwaveprop/workers/gefs_fetch_worker.ex
@@ -11,7 +11,7 @@ defmodule Microwaveprop.Workers.GefsFetchWorker do
   0.125° grid still carries ~200k cells.
   """
 
-  use Oban.Worker,
+  use Oban.Pro.Worker,
     queue: :gefs,
     max_attempts: 5,
     unique: [period: 3600, states: :incomplete]
diff --git a/lib/microwaveprop/workers/grid_cache_prune_worker.ex b/lib/microwaveprop/workers/grid_cache_prune_worker.ex
index 31839ab3..6f633948 100644
--- a/lib/microwaveprop/workers/grid_cache_prune_worker.ex
+++ b/lib/microwaveprop/workers/grid_cache_prune_worker.ex
@@ -9,7 +9,7 @@ defmodule Microwaveprop.Workers.GridCachePruneWorker do
   at a lower priority so the hourly grid chain never waits behind it.
   """
 
-  use Oban.Worker,
+  use Oban.Pro.Worker,
     queue: :propagation,
     priority: 5,
     max_attempts: 3,
diff --git a/lib/microwaveprop/workers/hrdps_grid_worker.ex b/lib/microwaveprop/workers/hrdps_grid_worker.ex
index 202f77e1..ecb1c9aa 100644
--- a/lib/microwaveprop/workers/hrdps_grid_worker.ex
+++ b/lib/microwaveprop/workers/hrdps_grid_worker.ex
@@ -28,7 +28,7 @@ defmodule Microwaveprop.Workers.HrdpsGridWorker do
   enqueuer call back to `GridTaskEnqueuer.seed_with_analysis/2`.
   """
 
-  use Oban.Worker,
+  use Oban.Pro.Worker,
     queue: :hrdps,
     priority: 0,
     max_attempts: 5,
diff --git a/lib/microwaveprop/workers/hrrr_native_grid_worker.ex b/lib/microwaveprop/workers/hrrr_native_grid_worker.ex
index 93ec0bec..20e669f7 100644
--- a/lib/microwaveprop/workers/hrrr_native_grid_worker.ex
+++ b/lib/microwaveprop/workers/hrrr_native_grid_worker.ex
@@ -15,7 +15,7 @@ defmodule Microwaveprop.Workers.HrrrNativeGridWorker do
   in a single pass.
   """
 
-  use Oban.Worker,
+  use Oban.Pro.Worker,
     queue: :hrrr,
     max_attempts: 3,
     unique: [
diff --git a/lib/microwaveprop/workers/iemre_fetch_worker.ex b/lib/microwaveprop/workers/iemre_fetch_worker.ex
index c39e5c99..473845e7 100644
--- a/lib/microwaveprop/workers/iemre_fetch_worker.ex
+++ b/lib/microwaveprop/workers/iemre_fetch_worker.ex
@@ -1,6 +1,6 @@
 defmodule Microwaveprop.Workers.IemreFetchWorker do
   @moduledoc false
-  use Oban.Worker,
+  use Oban.Pro.Worker,
     queue: :iemre,
     max_attempts: 20,
     unique: [period: 300, fields: [:args], states: :scheduled]
diff --git a/lib/microwaveprop/workers/ionosphere_fetch_worker.ex b/lib/microwaveprop/workers/ionosphere_fetch_worker.ex
index 04214136..f6f0db1b 100644
--- a/lib/microwaveprop/workers/ionosphere_fetch_worker.ex
+++ b/lib/microwaveprop/workers/ionosphere_fetch_worker.ex
@@ -13,7 +13,7 @@ defmodule Microwaveprop.Workers.IonosphereFetchWorker do
   idempotent on (station_code, valid_time).
   """
 
-  use Oban.Worker,
+  use Oban.Pro.Worker,
     queue: :ionosphere,
     max_attempts: 3,
     unique: [period: 300, states: :incomplete]
diff --git a/lib/microwaveprop/workers/mechanism_classify_worker.ex b/lib/microwaveprop/workers/mechanism_classify_worker.ex
index 9182376e..2050af13 100644
--- a/lib/microwaveprop/workers/mechanism_classify_worker.ex
+++ b/lib/microwaveprop/workers/mechanism_classify_worker.ex
@@ -19,7 +19,7 @@ defmodule Microwaveprop.Workers.MechanismClassifyWorker do
   backfill cron collapse to a single job per contact.
   """
 
-  use Oban.Worker,
+  use Oban.Pro.Worker,
     queue: :mechanism,
     max_attempts: 3,
     unique: [
diff --git a/lib/microwaveprop/workers/narr_fetch_worker.ex b/lib/microwaveprop/workers/narr_fetch_worker.ex
index f842954c..4fe3a5ed 100644
--- a/lib/microwaveprop/workers/narr_fetch_worker.ex
+++ b/lib/microwaveprop/workers/narr_fetch_worker.ex
@@ -17,7 +17,7 @@ defmodule Microwaveprop.Workers.NarrFetchWorker do
   See `docs/plans/2026-04-15-merra2-historical-backfill.md` for the full
   architecture.
   """
-  use Oban.Worker,
+  use Oban.Pro.Worker,
     queue: :narr,
     max_attempts: 3,
     unique: [
diff --git a/lib/microwaveprop/workers/nexrad_worker.ex b/lib/microwaveprop/workers/nexrad_worker.ex
index ce6bf8b9..eb4d4b7b 100644
--- a/lib/microwaveprop/workers/nexrad_worker.ex
+++ b/lib/microwaveprop/workers/nexrad_worker.ex
@@ -7,7 +7,7 @@ defmodule Microwaveprop.Workers.NexradWorker do
   sweeps that enqueue duplicate timestamps collapse automatically.
   """
 
-  use Oban.Worker,
+  use Oban.Pro.Worker,
     queue: :nexrad,
     max_attempts: 3,
     unique: [
diff --git a/lib/microwaveprop/workers/partition_maintenance_worker.ex b/lib/microwaveprop/workers/partition_maintenance_worker.ex
index 3bcd48f8..33fc91ae 100644
--- a/lib/microwaveprop/workers/partition_maintenance_worker.ex
+++ b/lib/microwaveprop/workers/partition_maintenance_worker.ex
@@ -16,7 +16,7 @@ defmodule Microwaveprop.Workers.PartitionMaintenanceWorker do
   cost of an extra empty partition is one zero-row table, while the
   cost of a missing partition is silently failed inserts.
   """
-  use Oban.Worker,
+  use Oban.Pro.Worker,
     queue: :admin,
     max_attempts: 3,
     unique: [period: 3600, states: :incomplete]
diff --git a/lib/microwaveprop/workers/propagation_grid_worker.ex b/lib/microwaveprop/workers/propagation_grid_worker.ex
index 567fa8e6..dcbfc8e5 100644
--- a/lib/microwaveprop/workers/propagation_grid_worker.ex
+++ b/lib/microwaveprop/workers/propagation_grid_worker.ex
@@ -16,7 +16,7 @@ defmodule Microwaveprop.Workers.PropagationGridWorker do
   chain step, through the PropagationNotifyListener path.
   """
 
-  use Oban.Worker,
+  use Oban.Pro.Worker,
     queue: :propagation,
     priority: 0,
     max_attempts: 5,
diff --git a/lib/microwaveprop/workers/propagation_prune_worker.ex b/lib/microwaveprop/workers/propagation_prune_worker.ex
index ad0fba9b..9d552ef8 100644
--- a/lib/microwaveprop/workers/propagation_prune_worker.ex
+++ b/lib/microwaveprop/workers/propagation_prune_worker.ex
@@ -9,7 +9,7 @@ defmodule Microwaveprop.Workers.PropagationPruneWorker do
   regardless of the compute worker's state.
   """
 
-  use Oban.Worker,
+  use Oban.Pro.Worker,
     queue: :propagation,
     # Lower priority than PropagationGridWorker so the hourly chain
     # never waits behind a pending prune on the shared :propagation
diff --git a/lib/microwaveprop/workers/pskr_calibration_worker.ex b/lib/microwaveprop/workers/pskr_calibration_worker.ex
index 2a37b2f2..169e9a15 100644
--- a/lib/microwaveprop/workers/pskr_calibration_worker.ex
+++ b/lib/microwaveprop/workers/pskr_calibration_worker.ex
@@ -46,7 +46,7 @@ defmodule Microwaveprop.Workers.PskrCalibrationWorker do
   lag for the current hour); the rolling-window cron remains the
   safety net.
   """
-  use Oban.Worker,
+  use Oban.Pro.Worker,
     queue: :backfill_enqueue,
     max_attempts: 3,
     unique: [
diff --git a/lib/microwaveprop/workers/pskr_recalibration_worker.ex b/lib/microwaveprop/workers/pskr_recalibration_worker.ex
index 0f536b50..7f04a1b7 100644
--- a/lib/microwaveprop/workers/pskr_recalibration_worker.ex
+++ b/lib/microwaveprop/workers/pskr_recalibration_worker.ex
@@ -14,7 +14,7 @@ defmodule Microwaveprop.Workers.PskrRecalibrationWorker do
   produces a fresh run record; previous runs stay queryable for
   trend comparison.
   """
-  use Oban.Worker,
+  use Oban.Pro.Worker,
     queue: :backfill_enqueue,
     max_attempts: 3,
     unique: [
diff --git a/lib/microwaveprop/workers/radar_frame_worker.ex b/lib/microwaveprop/workers/radar_frame_worker.ex
index f2c63c4b..ab2cf06b 100644
--- a/lib/microwaveprop/workers/radar_frame_worker.ex
+++ b/lib/microwaveprop/workers/radar_frame_worker.ex
@@ -18,7 +18,7 @@ defmodule Microwaveprop.Workers.RadarFrameWorker do
   # unique on frame_ts: backfill sweeps that re-select the same still-:queued
   # contacts each cycle would otherwise enqueue a fresh 1-job-per-contact
   # frame fetch. 9k+ wasteful duplicates observed in prod before this guard.
-  use Oban.Worker,
+  use Oban.Pro.Worker,
     queue: :radar,
     max_attempts: 3,
     unique: [fields: [:args], keys: [:frame_ts], states: :incomplete, period: :infinity]
diff --git a/lib/microwaveprop/workers/rover_mission_backfill_worker.ex b/lib/microwaveprop/workers/rover_mission_backfill_worker.ex
index e64e6582..5df6aba3 100644
--- a/lib/microwaveprop/workers/rover_mission_backfill_worker.ex
+++ b/lib/microwaveprop/workers/rover_mission_backfill_worker.ex
@@ -11,7 +11,7 @@ defmodule Microwaveprop.Workers.RoverMissionBackfillWorker do
   without operator action.
   """
 
-  use Oban.Worker,
+  use Oban.Pro.Worker,
     queue: :terrain,
     priority: 5,
     max_attempts: 3,
diff --git a/lib/microwaveprop/workers/rover_mission_reconcile_worker.ex b/lib/microwaveprop/workers/rover_mission_reconcile_worker.ex
index e744adf9..2b1a4343 100644
--- a/lib/microwaveprop/workers/rover_mission_reconcile_worker.ex
+++ b/lib/microwaveprop/workers/rover_mission_reconcile_worker.ex
@@ -13,7 +13,7 @@ defmodule Microwaveprop.Workers.RoverMissionReconcileWorker do
   tuples that aren't already represented.
   """
 
-  use Oban.Worker,
+  use Oban.Pro.Worker,
     queue: :terrain,
     priority: 3,
     max_attempts: 3,
diff --git a/lib/microwaveprop/workers/rover_path_profile_worker.ex b/lib/microwaveprop/workers/rover_path_profile_worker.ex
index e5f90152..0b5c7f70 100644
--- a/lib/microwaveprop/workers/rover_path_profile_worker.ex
+++ b/lib/microwaveprop/workers/rover_path_profile_worker.ex
@@ -15,7 +15,7 @@ defmodule Microwaveprop.Workers.RoverPathProfileWorker do
       `:erlang.term_to_binary/1` + Base64. PathLive decodes this when
       handed `?rover_path_id=UUID` and renders without recomputing.
   """
-  use Oban.Worker,
+  use Oban.Pro.Worker,
     queue: :rover_path,
     max_attempts: 5,
     unique: [
diff --git a/lib/microwaveprop/workers/solar_index_worker.ex b/lib/microwaveprop/workers/solar_index_worker.ex
index c480863b..4ca7cad2 100644
--- a/lib/microwaveprop/workers/solar_index_worker.ex
+++ b/lib/microwaveprop/workers/solar_index_worker.ex
@@ -1,6 +1,6 @@
 defmodule Microwaveprop.Workers.SolarIndexWorker do
   @moduledoc false
-  use Oban.Worker,
+  use Oban.Pro.Worker,
     queue: :solar,
     max_attempts: 3,
     unique: [period: 300, states: :incomplete]
diff --git a/lib/microwaveprop/workers/space_weather_fetch_worker.ex b/lib/microwaveprop/workers/space_weather_fetch_worker.ex
index 4a4c34f1..d1c2c282 100644
--- a/lib/microwaveprop/workers/space_weather_fetch_worker.ex
+++ b/lib/microwaveprop/workers/space_weather_fetch_worker.ex
@@ -12,7 +12,7 @@ defmodule Microwaveprop.Workers.SpaceWeatherFetchWorker do
   fetch is independent: a failure in one product doesn't block the others.
   """
 
-  use Oban.Worker,
+  use Oban.Pro.Worker,
     queue: :space_weather,
     max_attempts: 3,
     unique: [period: 120, states: :incomplete]
diff --git a/lib/microwaveprop/workers/station_elevation_worker.ex b/lib/microwaveprop/workers/station_elevation_worker.ex
index cd8f4c88..106348a8 100644
--- a/lib/microwaveprop/workers/station_elevation_worker.ex
+++ b/lib/microwaveprop/workers/station_elevation_worker.ex
@@ -8,7 +8,7 @@ defmodule Microwaveprop.Workers.StationElevationWorker do
   with `elevation_m = nil`. The worker also no-ops if the station has
   been deleted between enqueue and execution.
   """
-  use Oban.Worker, queue: :terrain, max_attempts: 3
+  use Oban.Pro.Worker, queue: :terrain, max_attempts: 3
 
   alias Microwaveprop.Repo
   alias Microwaveprop.Rover.FixedStation
diff --git a/lib/microwaveprop/workers/terrain_profile_worker.ex b/lib/microwaveprop/workers/terrain_profile_worker.ex
index d496a138..34d9e822 100644
--- a/lib/microwaveprop/workers/terrain_profile_worker.ex
+++ b/lib/microwaveprop/workers/terrain_profile_worker.ex
@@ -1,6 +1,6 @@
 defmodule Microwaveprop.Workers.TerrainProfileWorker do
   @moduledoc false
-  use Oban.Worker,
+  use Oban.Pro.Worker,
     queue: :terrain,
     max_attempts: 20,
     unique: [period: 300, states: :incomplete]
diff --git a/lib/microwaveprop/workers/user_home_qth_lookup_worker.ex b/lib/microwaveprop/workers/user_home_qth_lookup_worker.ex
index e6a5772a..ee838128 100644
--- a/lib/microwaveprop/workers/user_home_qth_lookup_worker.ex
+++ b/lib/microwaveprop/workers/user_home_qth_lookup_worker.ex
@@ -16,7 +16,7 @@ defmodule Microwaveprop.Workers.UserHomeQthLookupWorker do
       end)
   """
 
-  use Oban.Worker, queue: :weather, max_attempts: 3
+  use Oban.Pro.Worker, queue: :weather, max_attempts: 3
 
   alias Microwaveprop.Accounts
   alias Microwaveprop.Accounts.User
diff --git a/lib/microwaveprop/workers/weather_fetch_worker.ex b/lib/microwaveprop/workers/weather_fetch_worker.ex
index 4dc7fd92..897daba3 100644
--- a/lib/microwaveprop/workers/weather_fetch_worker.ex
+++ b/lib/microwaveprop/workers/weather_fetch_worker.ex
@@ -1,6 +1,6 @@
 defmodule Microwaveprop.Workers.WeatherFetchWorker do
   @moduledoc false
-  use Oban.Worker,
+  use Oban.Pro.Worker,
     queue: :weather,
     max_attempts: 20,
     unique: [period: :infinity, states: :incomplete]
diff --git a/lib/microwaveprop_web/api/fallback_controller.ex b/lib/microwaveprop_web/api/fallback_controller.ex
index da575696..41d9d129 100644
--- a/lib/microwaveprop_web/api/fallback_controller.ex
+++ b/lib/microwaveprop_web/api/fallback_controller.ex
@@ -9,6 +9,7 @@ defmodule MicrowavepropWeb.Api.FallbackController do
 
   alias MicrowavepropWeb.Api.ErrorJSON
 
+  @spec call(Plug.Conn.t(), term()) :: Plug.Conn.t()
   def call(conn, {:error, %Ecto.Changeset{} = changeset}) do
     ErrorJSON.send_changeset(conn, changeset)
   end
diff --git a/lib/microwaveprop_web/components/core_components.ex b/lib/microwaveprop_web/components/core_components.ex
index 6b6c9c05..6253f059 100644
--- a/lib/microwaveprop_web/components/core_components.ex
+++ b/lib/microwaveprop_web/components/core_components.ex
@@ -31,6 +31,7 @@ defmodule MicrowavepropWeb.CoreComponents do
   alias Phoenix.HTML.Form
   alias Phoenix.HTML.FormField
   alias Phoenix.LiveView.JS
+  alias Phoenix.LiveView.Rendered
 
   @doc """
   Renders flash notices.
@@ -48,6 +49,7 @@ defmodule MicrowavepropWeb.CoreComponents do
 
   slot :inner_block, doc: "the optional inner block that renders the flash message"
 
+  @spec flash(map()) :: Rendered.t()
   def flash(assigns) do
     assigns = assign_new(assigns, :id, fn -> "flash-#{assigns.kind}" end)
 
@@ -94,6 +96,7 @@ defmodule MicrowavepropWeb.CoreComponents do
   attr :variant, :string, values: ~w(primary)
   slot :inner_block, required: true
 
+  @spec button(map()) :: Rendered.t()
   def button(%{rest: rest} = assigns) do
     variants = %{"primary" => "btn-primary", nil => "btn-primary btn-soft"}
 
@@ -180,6 +183,7 @@ defmodule MicrowavepropWeb.CoreComponents do
   attr :rest, :global, include: ~w(accept autocomplete capture cols disabled form list max maxlength min minlength
                 multiple pattern placeholder readonly required rows size step)
 
+  @spec input(map()) :: Rendered.t()
   def input(%{field: %FormField{} = field} = assigns) do
     errors = if Phoenix.Component.used_input?(field), do: field.errors, else: []
 
@@ -317,6 +321,7 @@ defmodule MicrowavepropWeb.CoreComponents do
   slot :subtitle
   slot :actions
 
+  @spec header(map()) :: Rendered.t()
   def header(assigns) do
     ~H"""
     <header class={[@actions != [] && "flex items-center justify-between gap-6", "pb-4"]}>
@@ -339,8 +344,8 @@ defmodule MicrowavepropWeb.CoreComponents do
   ## Examples
 
       <.table id="users" rows={@users}>
-        <:col :let={user} label="id">{user.id}</:col>
-        <:col :let={user} label="username">{user.username}</:col>
+        <:col :let={row} label="id">{row.id}</:col>
+        <:col :let={row} label="username">{row.username}</:col>
       </.table>
   """
   attr :id, :string, required: true
@@ -363,6 +368,7 @@ defmodule MicrowavepropWeb.CoreComponents do
 
   slot :action, doc: "the slot for showing user actions in the last table column"
 
+  @spec table(map()) :: Rendered.t()
   def table(assigns) do
     assigns =
       with %{rows: %Phoenix.LiveView.LiveStream{}} <- assigns do
@@ -440,6 +446,7 @@ defmodule MicrowavepropWeb.CoreComponents do
     attr :title, :string, required: true
   end
 
+  @spec list(map()) :: Rendered.t()
   def list(assigns) do
     ~H"""
     <ul class="list">
@@ -456,14 +463,14 @@ defmodule MicrowavepropWeb.CoreComponents do
   @doc """
   Renders a [Heroicon](https://heroicons.com).
 
-  Heroicons come in three styles – outline, solid, and mini.
+  Heroicons come in three styles -- outline, solid, and mini.
   By default, the outline style is used, but solid and mini may
   be applied by using the `-solid` and `-mini` suffix.
 
   You can customize the size and colors of the icons by setting
   width, height, and background color classes.
 
-  Icons are extracted from the `deps/heroicons` directory and bundled within
+  Icons are extracted from the `deps/heroicon` directory and bundled within
   your compiled app.css by the plugin in `assets/vendor/heroicons.js`.
 
   ## Examples
@@ -474,6 +481,7 @@ defmodule MicrowavepropWeb.CoreComponents do
   attr :name, :string, required: true
   attr :class, :any, default: "size-4"
 
+  @spec icon(map()) :: Rendered.t()
   def icon(%{name: "hero-" <> _} = assigns) do
     ~H"""
     <span class={[@name, @class]} />
@@ -482,6 +490,7 @@ defmodule MicrowavepropWeb.CoreComponents do
 
   ## JS Commands
 
+  @spec show(JS.t(), String.t()) :: JS.t()
   def show(js \\ %JS{}, selector) do
     JS.show(js,
       to: selector,
@@ -492,6 +501,7 @@ defmodule MicrowavepropWeb.CoreComponents do
     )
   end
 
+  @spec hide(JS.t(), String.t()) :: JS.t()
   def hide(js \\ %JS{}, selector) do
     JS.hide(js,
       to: selector,
@@ -506,6 +516,7 @@ defmodule MicrowavepropWeb.CoreComponents do
   Interpolates an Ecto changeset error message. No i18n; plural messages
   are left as-is (Ecto emits the appropriate form based on `:count`).
   """
+  @spec translate_error({String.t(), keyword()}) :: String.t()
   def translate_error({msg, opts}) do
     Enum.reduce(opts, msg, fn {key, value}, acc ->
       String.replace(acc, "%{#{key}}", fn _ -> to_string(value) end)
@@ -515,6 +526,7 @@ defmodule MicrowavepropWeb.CoreComponents do
   @doc """
   Translates the errors for a field from a keyword list of errors.
   """
+  @spec translate_errors(Ecto.Changeset.t(), atom()) :: String.t()
   def translate_errors(errors, field) when is_list(errors) do
     for {^field, {msg, opts}} <- errors, do: translate_error({msg, opts})
   end
diff --git a/lib/microwaveprop_web/components/skew_t_chart.ex b/lib/microwaveprop_web/components/skew_t_chart.ex
index 44271d6f..12a3db91 100644
--- a/lib/microwaveprop_web/components/skew_t_chart.ex
+++ b/lib/microwaveprop_web/components/skew_t_chart.ex
@@ -11,6 +11,7 @@ defmodule MicrowavepropWeb.Components.SkewTChart do
 
   attr :profile, :list, required: true
 
+  @spec skew_t_chart(map()) :: Phoenix.LiveView.Rendered.t()
   def skew_t_chart(assigns) do
     chart = SkewT.build(assigns.profile)
     usable_points = if chart, do: length(chart.t_points), else: 0
diff --git a/lib/microwaveprop_web/controllers/api/v1/auth_controller.ex b/lib/microwaveprop_web/controllers/api/v1/auth_controller.ex
index fbaacc95..5657f52a 100644
--- a/lib/microwaveprop_web/controllers/api/v1/auth_controller.ex
+++ b/lib/microwaveprop_web/controllers/api/v1/auth_controller.ex
@@ -21,6 +21,7 @@ defmodule MicrowavepropWeb.Api.V1.AuthController do
   "expires_at": "ISO8601" (optional)}`. Returns the plaintext token
   and the persisted record.
   """
+  @spec create(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def create(conn, params) do
     with {:ok, email} <- fetch_string(params, "email"),
          {:ok, password} <- fetch_string(params, "password"),
diff --git a/lib/microwaveprop_web/controllers/api/v1/beacon_controller.ex b/lib/microwaveprop_web/controllers/api/v1/beacon_controller.ex
index 979fa63c..2aa21870 100644
--- a/lib/microwaveprop_web/controllers/api/v1/beacon_controller.ex
+++ b/lib/microwaveprop_web/controllers/api/v1/beacon_controller.ex
@@ -10,11 +10,13 @@ defmodule MicrowavepropWeb.Api.V1.BeaconController do
   plug :accepts, ["json"]
   action_fallback MicrowavepropWeb.Api.FallbackController
 
+  @spec index(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def index(conn, _params) do
     beacons = Beacons.list_beacons()
     json(conn, BeaconJSON.index(%{beacons: beacons}))
   end
 
+  @spec show(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def show(conn, %{"id" => id}) do
     viewer = conn.assigns[:current_api_user]
 
@@ -24,6 +26,7 @@ defmodule MicrowavepropWeb.Api.V1.BeaconController do
     end
   end
 
+  @spec create(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def create(conn, params) do
     user = conn.assigns.current_api_user
 
diff --git a/lib/microwaveprop_web/controllers/api/v1/beacon_json.ex b/lib/microwaveprop_web/controllers/api/v1/beacon_json.ex
index 6205d4a2..3553d42d 100644
--- a/lib/microwaveprop_web/controllers/api/v1/beacon_json.ex
+++ b/lib/microwaveprop_web/controllers/api/v1/beacon_json.ex
@@ -3,7 +3,10 @@ defmodule MicrowavepropWeb.Api.V1.BeaconJSON do
 
   alias Microwaveprop.Beacons.Beacon
 
+  @spec index(map()) :: map()
   def index(%{beacons: beacons}), do: %{data: Enum.map(beacons, &data/1)}
+
+  @spec show(map()) :: map()
   def show(%{beacon: beacon}), do: %{data: data(beacon)}
 
   defp data(%Beacon{} = b) do
diff --git a/lib/microwaveprop_web/controllers/api/v1/beacon_monitor_json.ex b/lib/microwaveprop_web/controllers/api/v1/beacon_monitor_json.ex
index ab49b53d..1f844abf 100644
--- a/lib/microwaveprop_web/controllers/api/v1/beacon_monitor_json.ex
+++ b/lib/microwaveprop_web/controllers/api/v1/beacon_monitor_json.ex
@@ -3,7 +3,10 @@ defmodule MicrowavepropWeb.Api.V1.BeaconMonitorJSON do
 
   alias Microwaveprop.BeaconMonitors.BeaconMonitor
 
+  @spec index(map()) :: map()
   def index(%{monitors: monitors}), do: %{data: Enum.map(monitors, &data/1)}
+
+  @spec show(map()) :: map()
   def show(%{monitor: monitor}), do: %{data: data(monitor)}
 
   defp data(%BeaconMonitor{} = m) do
diff --git a/lib/microwaveprop_web/controllers/api/v1/beacon_monitor_measurement_controller.ex b/lib/microwaveprop_web/controllers/api/v1/beacon_monitor_measurement_controller.ex
index e2630b63..2113c5d7 100644
--- a/lib/microwaveprop_web/controllers/api/v1/beacon_monitor_measurement_controller.ex
+++ b/lib/microwaveprop_web/controllers/api/v1/beacon_monitor_measurement_controller.ex
@@ -28,6 +28,7 @@ defmodule MicrowavepropWeb.Api.V1.BeaconMonitorMeasurementController do
                   snr_peak_db snr_avg_db signal_active_fraction
                   propmonitor_version)
 
+  @spec create(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def create(conn, params) do
     monitor = conn.assigns.current_monitor
     attrs = Map.take(params, @wire_fields)
diff --git a/lib/microwaveprop_web/controllers/api/v1/contact_controller.ex b/lib/microwaveprop_web/controllers/api/v1/contact_controller.ex
index 3c91241f..0104dda5 100644
--- a/lib/microwaveprop_web/controllers/api/v1/contact_controller.ex
+++ b/lib/microwaveprop_web/controllers/api/v1/contact_controller.ex
@@ -15,6 +15,7 @@ defmodule MicrowavepropWeb.Api.V1.ContactController do
 
   @max_per_page 200
 
+  @spec index(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def index(conn, params) do
     page = params |> Map.get("page", "1") |> parse_int(1)
     per_page = params |> Map.get("per_page", "50") |> parse_int(50) |> min(@max_per_page) |> max(1)
@@ -42,6 +43,7 @@ defmodule MicrowavepropWeb.Api.V1.ContactController do
     )
   end
 
+  @spec show(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def show(conn, %{"id" => id}) do
     viewer = conn.assigns[:current_api_user]
 
@@ -61,6 +63,7 @@ defmodule MicrowavepropWeb.Api.V1.ContactController do
     end
   end
 
+  @spec create(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def create(conn, params) do
     user = conn.assigns.current_api_user
 
diff --git a/lib/microwaveprop_web/controllers/api/v1/contact_json.ex b/lib/microwaveprop_web/controllers/api/v1/contact_json.ex
index ff9f80e1..fc3a43bc 100644
--- a/lib/microwaveprop_web/controllers/api/v1/contact_json.ex
+++ b/lib/microwaveprop_web/controllers/api/v1/contact_json.ex
@@ -4,11 +4,13 @@ defmodule MicrowavepropWeb.Api.V1.ContactJSON do
   alias Microwaveprop.Accounts.User
   alias Microwaveprop.Radio.Contact
 
+  @spec index(map()) :: map()
   def index(%{contacts: contacts} = assigns) do
     viewer = Map.get(assigns, :viewer)
     %{data: Enum.map(contacts, &data(&1, viewer))}
   end
 
+  @spec index_paginated(map()) :: map()
   def index_paginated(%{contacts: contacts} = assigns) do
     viewer = Map.get(assigns, :viewer)
 
@@ -23,6 +25,7 @@ defmodule MicrowavepropWeb.Api.V1.ContactJSON do
     }
   end
 
+  @spec show(map()) :: map()
   def show(%{contact: contact} = assigns) do
     viewer = Map.get(assigns, :viewer)
     %{data: data(contact, viewer)}
diff --git a/lib/microwaveprop_web/controllers/api/v1/me_controller.ex b/lib/microwaveprop_web/controllers/api/v1/me_controller.ex
index 50f1a7c6..527453b7 100644
--- a/lib/microwaveprop_web/controllers/api/v1/me_controller.ex
+++ b/lib/microwaveprop_web/controllers/api/v1/me_controller.ex
@@ -22,11 +22,13 @@ defmodule MicrowavepropWeb.Api.V1.MeController do
 
   ## Profile -----------------------------------------------------------
 
+  @spec show(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def show(conn, _params) do
     user = conn.assigns.current_api_user
     json(conn, UserJSON.me(user))
   end
 
+  @spec update(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def update(conn, params) do
     user = conn.assigns.current_api_user
     attrs = Map.take(params, ["home_grid", "home_lat", "home_lon", "home_elevation_m"])
@@ -39,6 +41,7 @@ defmodule MicrowavepropWeb.Api.V1.MeController do
 
   ## My contacts -------------------------------------------------------
 
+  @spec contacts(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def contacts(conn, _params) do
     user = conn.assigns.current_api_user
     contacts = Radio.list_contacts_for_user(user, user)
@@ -47,6 +50,7 @@ defmodule MicrowavepropWeb.Api.V1.MeController do
 
   ## My beacons --------------------------------------------------------
 
+  @spec beacons(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def beacons(conn, _params) do
     user = conn.assigns.current_api_user
     beacons = Beacons.list_beacons_for_user(user, user)
@@ -55,12 +59,14 @@ defmodule MicrowavepropWeb.Api.V1.MeController do
 
   ## API tokens --------------------------------------------------------
 
+  @spec list_tokens(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def list_tokens(conn, _params) do
     user = conn.assigns.current_api_user
     tokens = Accounts.list_api_tokens(user)
     json(conn, TokenJSON.index(%{tokens: tokens}))
   end
 
+  @spec revoke_token(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def revoke_token(conn, %{"id" => id}) do
     user = conn.assigns.current_api_user
 
@@ -71,12 +77,14 @@ defmodule MicrowavepropWeb.Api.V1.MeController do
 
   ## Beacon monitors ---------------------------------------------------
 
+  @spec list_monitors(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def list_monitors(conn, _params) do
     user = conn.assigns.current_api_user
     monitors = BeaconMonitors.list_monitors_for_user(user)
     json(conn, BeaconMonitorJSON.index(%{monitors: monitors}))
   end
 
+  @spec create_monitor(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def create_monitor(conn, params) do
     user = conn.assigns.current_api_user
     attrs = Map.take(params, ["name"])
@@ -92,6 +100,7 @@ defmodule MicrowavepropWeb.Api.V1.MeController do
     end
   end
 
+  @spec delete_monitor(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def delete_monitor(conn, %{"id" => id}) do
     user = conn.assigns.current_api_user
 
diff --git a/lib/microwaveprop_web/controllers/api/v1/profile_controller.ex b/lib/microwaveprop_web/controllers/api/v1/profile_controller.ex
index 2e9b0cd4..31d87a74 100644
--- a/lib/microwaveprop_web/controllers/api/v1/profile_controller.ex
+++ b/lib/microwaveprop_web/controllers/api/v1/profile_controller.ex
@@ -13,6 +13,7 @@ defmodule MicrowavepropWeb.Api.V1.ProfileController do
 
   plug :accepts, ["json"]
 
+  @spec show(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def show(conn, %{"callsign" => callsign}) do
     case Accounts.get_user_by_callsign(callsign) do
       nil ->
diff --git a/lib/microwaveprop_web/controllers/api/v1/score_controller.ex b/lib/microwaveprop_web/controllers/api/v1/score_controller.ex
index 391fe614..5c8151b9 100644
--- a/lib/microwaveprop_web/controllers/api/v1/score_controller.ex
+++ b/lib/microwaveprop_web/controllers/api/v1/score_controller.ex
@@ -17,6 +17,7 @@ defmodule MicrowavepropWeb.Api.V1.ScoreController do
 
   plug :accepts, ["json"]
 
+  @spec bands(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def bands(conn, _params) do
     list =
       Enum.map(BandConfig.all_freqs(), fn mhz ->
@@ -27,6 +28,7 @@ defmodule MicrowavepropWeb.Api.V1.ScoreController do
     json(conn, %{data: list})
   end
 
+  @spec show(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def show(conn, params) do
     with {:ok, band} <- parse_band(params["band"]),
          {:ok, lat} <- parse_float(params["lat"], "lat"),
@@ -44,6 +46,7 @@ defmodule MicrowavepropWeb.Api.V1.ScoreController do
     end
   end
 
+  @spec forecast(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def forecast(conn, params) do
     with {:ok, band} <- parse_band(params["band"]),
          {:ok, lat} <- parse_float(params["lat"], "lat"),
diff --git a/lib/microwaveprop_web/controllers/api/v1/token_json.ex b/lib/microwaveprop_web/controllers/api/v1/token_json.ex
index 47e7d1c2..69cc87b4 100644
--- a/lib/microwaveprop_web/controllers/api/v1/token_json.ex
+++ b/lib/microwaveprop_web/controllers/api/v1/token_json.ex
@@ -4,14 +4,17 @@ defmodule MicrowavepropWeb.Api.V1.TokenJSON do
   alias Microwaveprop.Accounts.UserApiToken
 
   @doc "Token list view (no plaintext — never recoverable after creation)."
+  @spec index(map()) :: map()
   def index(%{tokens: tokens}) do
     %{data: Enum.map(tokens, &data/1)}
   end
 
   @doc "Single token without plaintext."
+  @spec show(map()) :: map()
   def show(%{token: token}), do: %{data: data(token)}
 
   @doc "Single token including the one-time plaintext value at the top level."
+  @spec show_with_plaintext(UserApiToken.t(), String.t()) :: map()
   def show_with_plaintext(%UserApiToken{} = token, plaintext) do
     %{data: data(token), token: plaintext}
   end
diff --git a/lib/microwaveprop_web/controllers/api/v1/user_json.ex b/lib/microwaveprop_web/controllers/api/v1/user_json.ex
index ac529073..70582deb 100644
--- a/lib/microwaveprop_web/controllers/api/v1/user_json.ex
+++ b/lib/microwaveprop_web/controllers/api/v1/user_json.ex
@@ -4,6 +4,7 @@ defmodule MicrowavepropWeb.Api.V1.UserJSON do
   alias Microwaveprop.Accounts.User
 
   @doc "Public profile (no email)."
+  @spec public(User.t()) :: map()
   def public(%User{} = user) do
     %{
       data: %{
@@ -18,6 +19,7 @@ defmodule MicrowavepropWeb.Api.V1.UserJSON do
   end
 
   @doc "Authenticated /me view (includes email + admin flag)."
+  @spec me(User.t()) :: map()
   def me(%User{} = user) do
     %{
       data: %{
diff --git a/lib/microwaveprop_web/controllers/api_token_controller.ex b/lib/microwaveprop_web/controllers/api_token_controller.ex
index ecdcafe0..c142694a 100644
--- a/lib/microwaveprop_web/controllers/api_token_controller.ex
+++ b/lib/microwaveprop_web/controllers/api_token_controller.ex
@@ -10,6 +10,7 @@ defmodule MicrowavepropWeb.ApiTokenController do
 
   alias Microwaveprop.Accounts
 
+  @spec create(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def create(conn, %{"api_token" => params}) do
     user = conn.assigns.current_scope.user
 
@@ -32,6 +33,7 @@ defmodule MicrowavepropWeb.ApiTokenController do
     end
   end
 
+  @spec delete(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def delete(conn, %{"id" => id}) do
     user = conn.assigns.current_scope.user
 
diff --git a/lib/microwaveprop_web/controllers/beacon_monitor_controller.ex b/lib/microwaveprop_web/controllers/beacon_monitor_controller.ex
index be0690c8..d9c1b926 100644
--- a/lib/microwaveprop_web/controllers/beacon_monitor_controller.ex
+++ b/lib/microwaveprop_web/controllers/beacon_monitor_controller.ex
@@ -3,6 +3,7 @@ defmodule MicrowavepropWeb.BeaconMonitorController do
 
   alias Microwaveprop.BeaconMonitors
 
+  @spec create(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def create(conn, %{"beacon_monitor" => params}) do
     user = conn.assigns.current_scope.user
 
@@ -24,6 +25,7 @@ defmodule MicrowavepropWeb.BeaconMonitorController do
     end
   end
 
+  @spec delete(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def delete(conn, %{"id" => id}) do
     user = conn.assigns.current_scope.user
 
diff --git a/lib/microwaveprop_web/controllers/contact_map_controller.ex b/lib/microwaveprop_web/controllers/contact_map_controller.ex
index 27fef85d..772d9851 100644
--- a/lib/microwaveprop_web/controllers/contact_map_controller.ex
+++ b/lib/microwaveprop_web/controllers/contact_map_controller.ex
@@ -15,6 +15,7 @@ defmodule MicrowavepropWeb.ContactMapController do
   @cache_ttl_ms 10 * 60 * 1_000
 
   @doc false
+  @spec cache_key() :: {module(), :gzipped_payload}
   def cache_key, do: @cache_key
 
   @spec show(Plug.Conn.t(), map()) :: Plug.Conn.t()
diff --git a/lib/microwaveprop_web/controllers/health_controller.ex b/lib/microwaveprop_web/controllers/health_controller.ex
index b68baa3a..ee027e99 100644
--- a/lib/microwaveprop_web/controllers/health_controller.ex
+++ b/lib/microwaveprop_web/controllers/health_controller.ex
@@ -22,12 +22,14 @@ defmodule MicrowavepropWeb.HealthController do
 
   alias Ecto.Adapters.SQL
 
+  @spec live(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def live(conn, _params) do
     conn
     |> put_resp_content_type("text/plain")
     |> send_resp(200, "ok")
   end
 
+  @spec check(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def check(conn, _params) do
     _ = SQL.query!(Microwaveprop.Repo, "SELECT 1")
 
diff --git a/lib/microwaveprop_web/controllers/page_controller.ex b/lib/microwaveprop_web/controllers/page_controller.ex
index 17e00fa1..ff0f4060 100644
--- a/lib/microwaveprop_web/controllers/page_controller.ex
+++ b/lib/microwaveprop_web/controllers/page_controller.ex
@@ -1,14 +1,17 @@
 defmodule MicrowavepropWeb.PageController do
   use MicrowavepropWeb, :controller
 
+  @spec home(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def home(conn, _params) do
     redirect(conn, to: ~p"/map")
   end
 
+  @spec redirect_contacts(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def redirect_contacts(conn, _params) do
     redirect(conn, to: ~p"/contacts")
   end
 
+  @spec redirect_contact(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def redirect_contact(conn, %{"id" => id}) do
     redirect(conn, to: ~p"/contacts/#{id}")
   end
diff --git a/lib/microwaveprop_web/controllers/user_registration_controller.ex b/lib/microwaveprop_web/controllers/user_registration_controller.ex
index f6b8bfa6..cb25f1ed 100644
--- a/lib/microwaveprop_web/controllers/user_registration_controller.ex
+++ b/lib/microwaveprop_web/controllers/user_registration_controller.ex
@@ -4,11 +4,13 @@ defmodule MicrowavepropWeb.UserRegistrationController do
   alias Microwaveprop.Accounts
   alias Microwaveprop.Accounts.User
 
+  @spec new(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def new(conn, _params) do
     changeset = Accounts.change_user_registration(%User{})
     render(conn, :new, changeset: changeset)
   end
 
+  @spec create(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def create(conn, %{"user" => user_params}) do
     case Accounts.register_user(user_params) do
       {:ok, user} ->
diff --git a/lib/microwaveprop_web/controllers/user_reset_password_controller.ex b/lib/microwaveprop_web/controllers/user_reset_password_controller.ex
index 8fa2a39b..58ab597a 100644
--- a/lib/microwaveprop_web/controllers/user_reset_password_controller.ex
+++ b/lib/microwaveprop_web/controllers/user_reset_password_controller.ex
@@ -5,10 +5,12 @@ defmodule MicrowavepropWeb.UserResetPasswordController do
 
   plug :get_user_by_reset_password_token when action in [:edit, :update]
 
+  @spec new(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def new(conn, _params) do
     render(conn, :new)
   end
 
+  @spec create(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def create(conn, %{"user" => %{"email" => email}}) do
     _ =
       if user = Accounts.get_user_by_email(email) do
@@ -30,6 +32,7 @@ defmodule MicrowavepropWeb.UserResetPasswordController do
     |> redirect(to: ~p"/users/log-in")
   end
 
+  @spec edit(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def edit(conn, _params) do
     render(conn, :edit,
       changeset: Accounts.change_user_password(conn.assigns.user),
@@ -37,6 +40,7 @@ defmodule MicrowavepropWeb.UserResetPasswordController do
     )
   end
 
+  @spec update(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def update(conn, %{"user" => user_params}) do
     case Accounts.reset_user_password(conn.assigns.user, user_params) do
       {:ok, _} ->
diff --git a/lib/microwaveprop_web/controllers/user_session_controller.ex b/lib/microwaveprop_web/controllers/user_session_controller.ex
index fa11230f..406f0111 100644
--- a/lib/microwaveprop_web/controllers/user_session_controller.ex
+++ b/lib/microwaveprop_web/controllers/user_session_controller.ex
@@ -5,6 +5,7 @@ defmodule MicrowavepropWeb.UserSessionController do
   alias Microwaveprop.Accounts.User
   alias MicrowavepropWeb.UserAuth
 
+  @spec new(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def new(conn, _params) do
     email = get_in(conn.assigns, [:current_scope, Access.key(:user), Access.key(:email)])
     form = Phoenix.Component.to_form(%{"email" => email}, as: "user")
@@ -12,6 +13,7 @@ defmodule MicrowavepropWeb.UserSessionController do
     render(conn, :new, form: form)
   end
 
+  @spec create(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def create(conn, %{"user" => %{"email" => email, "password" => password} = user_params}) do
     case Accounts.get_user_by_email_and_password(email, password) do
       %User{confirmed_at: nil} ->
@@ -39,6 +41,7 @@ defmodule MicrowavepropWeb.UserSessionController do
     end
   end
 
+  @spec confirm(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def confirm(conn, %{"token" => token}) do
     case Accounts.confirm_user_by_token(token) do
       {:ok, {user, _expired_tokens}} ->
@@ -53,6 +56,7 @@ defmodule MicrowavepropWeb.UserSessionController do
     end
   end
 
+  @spec delete(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def delete(conn, _params) do
     conn
     |> put_flash(:info, "Logged out successfully.")
diff --git a/lib/microwaveprop_web/controllers/user_settings_controller.ex b/lib/microwaveprop_web/controllers/user_settings_controller.ex
index 718483d4..2699e3dd 100644
--- a/lib/microwaveprop_web/controllers/user_settings_controller.ex
+++ b/lib/microwaveprop_web/controllers/user_settings_controller.ex
@@ -13,10 +13,12 @@ defmodule MicrowavepropWeb.UserSettingsController do
   plug :assign_beacon_monitors
   plug :assign_api_tokens
 
+  @spec edit(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def edit(conn, _params) do
     render(conn, :edit)
   end
 
+  @spec update(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def update(conn, %{"action" => "update_email"} = params) do
     %{"user" => user_params} = params
     user = conn.assigns.current_scope.user
@@ -73,6 +75,7 @@ defmodule MicrowavepropWeb.UserSettingsController do
     end
   end
 
+  @spec confirm_email(Plug.Conn.t(), map()) :: Plug.Conn.t()
   def confirm_email(conn, %{"token" => token}) do
     case Accounts.update_user_email(conn.assigns.current_scope.user, token) do
       {:ok, _user} ->
diff --git a/lib/microwaveprop_web/live/admin/contact_edit_live.ex b/lib/microwaveprop_web/live/admin/contact_edit_live.ex
index d54efac9..db74c231 100644
--- a/lib/microwaveprop_web/live/admin/contact_edit_live.ex
+++ b/lib/microwaveprop_web/live/admin/contact_edit_live.ex
@@ -6,10 +6,12 @@ defmodule MicrowavepropWeb.Admin.ContactEditLive do
   alias Microwaveprop.Radio
   alias Microwaveprop.Radio.EditNotifier
 
+  @spec table_options() :: map()
   def table_options do
     %{exports: %{formats: [:csv]}}
   end
 
+  @spec fields() :: keyword()
   def fields do
     [
       id: %{label: "ID", hidden: true},
@@ -20,8 +22,10 @@ defmodule MicrowavepropWeb.Admin.ContactEditLive do
     ]
   end
 
+  @spec filters() :: list()
   def filters, do: []
 
+  @spec actions() :: keyword()
   def actions do
     [
       review: fn %{record: edit} ->
diff --git a/lib/microwaveprop_web/live/beacon_live/index.ex b/lib/microwaveprop_web/live/beacon_live/index.ex
index c4e6b65f..7d5b85f8 100644
--- a/lib/microwaveprop_web/live/beacon_live/index.ex
+++ b/lib/microwaveprop_web/live/beacon_live/index.ex
@@ -6,10 +6,12 @@ defmodule MicrowavepropWeb.BeaconLive.Index do
   alias Microwaveprop.Beacons
   alias Microwaveprop.Beacons.Beacon
 
+  @spec table_options() :: map()
   def table_options do
     %{exports: %{formats: [:csv]}}
   end
 
+  @spec fields() :: keyword()
   def fields do
     [
       id: %{label: "ID", hidden: true},
@@ -28,8 +30,10 @@ defmodule MicrowavepropWeb.BeaconLive.Index do
     ]
   end
 
+  @spec filters() :: list()
   def filters, do: []
 
+  @spec actions() :: keyword()
   def actions do
     [
       show: fn %{record: beacon} ->
diff --git a/lib/microwaveprop_web/live/contact_live/index.ex b/lib/microwaveprop_web/live/contact_live/index.ex
index 781bba9c..2c6d8090 100644
--- a/lib/microwaveprop_web/live/contact_live/index.ex
+++ b/lib/microwaveprop_web/live/contact_live/index.ex
@@ -11,6 +11,7 @@ defmodule MicrowavepropWeb.ContactLive.Index do
   alias Microwaveprop.Radio.Contact
   alias Microwaveprop.Repo
 
+  @spec table_options() :: map()
   def table_options do
     %{
       sorting: %{default_sort: [inserted_at: :desc]},
@@ -18,6 +19,7 @@ defmodule MicrowavepropWeb.ContactLive.Index do
     }
   end
 
+  @spec fields() :: keyword()
   def fields do
     [
       id: %{label: "ID", hidden: true},
@@ -35,8 +37,10 @@ defmodule MicrowavepropWeb.ContactLive.Index do
     ]
   end
 
+  @spec filters() :: list()
   def filters, do: []
 
+  @spec actions() :: keyword()
   def actions do
     [
       view: fn %{record: contact} ->
@@ -141,6 +145,7 @@ defmodule MicrowavepropWeb.ContactLive.Index do
   @doc false
   # Called by LiveTable to get the base queryable. Must be a
   # named function because the helper persists MFA across renders.
+  @spec visible_query_provider(scope_token :: term()) :: Ecto.Query.t()
   def visible_query_provider(scope_token) do
     scope_token
     |> scope_from_token()
diff --git a/lib/microwaveprop_web/live/map_live.ex b/lib/microwaveprop_web/live/map_live.ex
index 0225e9d0..068edca6 100644
--- a/lib/microwaveprop_web/live/map_live.ex
+++ b/lib/microwaveprop_web/live/map_live.ex
@@ -70,7 +70,6 @@ defmodule MicrowavepropWeb.MapLive do
       resolve_view(params, session, recovered_band, recovered_time)
 
     visitor = visitor_location(session)
-    bounds = bounds_around(center)
 
     # Score data is fetched by the client over HTTP (see /scores/cells
     # and propagation_map_hook.ts). The LiveView only owns timeline,
@@ -86,7 +85,6 @@ defmodule MicrowavepropWeb.MapLive do
        valid_times: valid_times,
        selected_time: selected_time,
        tracking_now?: tracking_now?(selected_time, valid_times, DateTime.utc_now()),
-       bounds: bounds,
        initial_center: center,
        initial_zoom: zoom,
        current_center: center,
@@ -173,18 +171,6 @@ defmodule MicrowavepropWeb.MapLive do
     DateTime.compare(t, earliest) != :lt and DateTime.compare(t, latest) != :gt
   end
 
-  # Build a bounding box roughly matching the hardcoded default (~3.4° × 9°)
-  # around a given center so the initial HRRR score query still returns a
-  # useful tile set for the visible area.
-  defp bounds_around(%{lat: lat, lon: lon}) do
-    %{
-      "south" => lat - 3.4,
-      "north" => lat + 3.4,
-      "west" => lon - 4.5,
-      "east" => lon + 4.5
-    }
-  end
-
   @impl true
   def handle_params(_params, _url, socket) do
     # URL params are applied in mount/3; subsequent push_patch calls
diff --git a/lib/microwaveprop_web/live/rover_live.ex b/lib/microwaveprop_web/live/rover_live.ex
index 668bd832..d564cfe0 100644
--- a/lib/microwaveprop_web/live/rover_live.ex
+++ b/lib/microwaveprop_web/live/rover_live.ex
@@ -61,7 +61,6 @@ defmodule MicrowavepropWeb.RoverLive do
        fixed_stations: fixed_stations,
        persisted?: persisted?,
        home: home,
-       valid_times: valid_times,
        current_valid_time: current_valid_time,
        top_candidates: [],
        selected_candidate: nil,
diff --git a/lib/microwaveprop_web/live/rover_locations_live.ex b/lib/microwaveprop_web/live/rover_locations_live.ex
index 2087a364..2141bffe 100644
--- a/lib/microwaveprop_web/live/rover_locations_live.ex
+++ b/lib/microwaveprop_web/live/rover_locations_live.ex
@@ -17,10 +17,12 @@ defmodule MicrowavepropWeb.RoverLocationsLive do
 
   @valid_status_filters ~w(good bad)
 
+  @spec table_options() :: map()
   def table_options do
     %{sorting: %{default_sort: [inserted_at: :desc]}}
   end
 
+  @spec fields() :: keyword()
   def fields do
     [
       id: %{label: "ID", hidden: true},
@@ -33,11 +35,13 @@ defmodule MicrowavepropWeb.RoverLocationsLive do
     ]
   end
 
+  @spec filters() :: list()
   def filters, do: []
 
   @doc false
   # Called by LiveTable to get the base queryable. Filters by status when
   # the user picks one in the in-page select; nil means show all.
+  @spec visible_query_provider(status_filter :: term()) :: Ecto.Query.t()
   def visible_query_provider(status_filter) do
     base = from(l in Location, as: :resource)
 
diff --git a/lib/microwaveprop_web/live/rover_planning_live.ex b/lib/microwaveprop_web/live/rover_planning_live.ex
index 66b2f386..36ce1fda 100644
--- a/lib/microwaveprop_web/live/rover_planning_live.ex
+++ b/lib/microwaveprop_web/live/rover_planning_live.ex
@@ -10,10 +10,12 @@ defmodule MicrowavepropWeb.RoverPlanningLive do
   alias Microwaveprop.RoverPlanning
   alias Microwaveprop.RoverPlanning.Mission
 
+  @spec table_options() :: map()
   def table_options do
     %{sorting: %{default_sort: [inserted_at: :desc]}}
   end
 
+  @spec fields() :: keyword()
   def fields do
     [
       id: %{label: "ID", hidden: true},
@@ -25,6 +27,7 @@ defmodule MicrowavepropWeb.RoverPlanningLive do
     ]
   end
 
+  @spec filters() :: list()
   def filters, do: []
 
   @impl true
diff --git a/lib/microwaveprop_web/live/user_management_live/index.ex b/lib/microwaveprop_web/live/user_management_live/index.ex
index 682fa344..1ee94342 100644
--- a/lib/microwaveprop_web/live/user_management_live/index.ex
+++ b/lib/microwaveprop_web/live/user_management_live/index.ex
@@ -5,6 +5,7 @@ defmodule MicrowavepropWeb.UserManagementLive.Index do
 
   alias Microwaveprop.Accounts
 
+  @spec table_options() :: map()
   def table_options do
     %{exports: %{formats: [:csv]}}
   end
@@ -14,6 +15,7 @@ defmodule MicrowavepropWeb.UserManagementLive.Index do
     {:ok, assign(socket, :page_title, "Users")}
   end
 
+  @spec fields() :: keyword()
   def fields do
     [
       id: %{label: "ID", hidden: true},
@@ -25,8 +27,10 @@ defmodule MicrowavepropWeb.UserManagementLive.Index do
     ]
   end
 
+  @spec filters() :: list()
   def filters, do: []
 
+  @spec actions() :: keyword()
   def actions do
     [
       edit: fn %{record: user} ->
diff --git a/lib/microwaveprop_web/live/weather_map_live.ex b/lib/microwaveprop_web/live/weather_map_live.ex
index 420f591f..9d2d5180 100644
--- a/lib/microwaveprop_web/live/weather_map_live.ex
+++ b/lib/microwaveprop_web/live/weather_map_live.ex
@@ -137,6 +137,7 @@ defmodule MicrowavepropWeb.WeatherMapLive do
   # Public for direct unit testing: anchoring an integration test on a
   # truncated `utc_now()` would only assert the new behavior past minute
   # 30 of the wall clock.
+  @spec pick_initial_valid_time([DateTime.t()], DateTime.t()) :: DateTime.t() | nil
   def pick_initial_valid_time(valid_times, now \\ DateTime.utc_now())
   def pick_initial_valid_time([], _now), do: nil
 
diff --git a/lib/mix/tasks/unused.ex b/lib/mix/tasks/unused.ex
index 00b39d0a..cb5c8e1d 100644
--- a/lib/mix/tasks/unused.ex
+++ b/lib/mix/tasks/unused.ex
@@ -328,23 +328,7 @@ defmodule Mix.Tasks.Unused do
     # Find unused: defined but never called
     unused =
       all_defs
-      |> Enum.reject(fn {mod, name, arity} ->
-        # Skip ignored functions (OTP callbacks, compiler-generated, etc.)
-        # Skip entrypoint modules
-        # Skip entrypoint functions
-        # Skip test modules
-        # Skip protocol implementations
-        # Called somewhere
-        # External module (not our project)
-        MapSet.member?(@ignored_functions, {name, arity}) or
-          MapSet.member?(@entrypoint_modules, Atom.to_string(mod)) or
-          MapSet.member?(@entrypoint_functions, {name, arity}) or
-          String.ends_with?(Atom.to_string(mod), "Test") or
-          String.ends_with?(Atom.to_string(mod), "Fixtures") or
-          String.contains?(Atom.to_string(mod), ".Impl.") or
-          MapSet.member?(all_calls, {mod, name, arity}) or
-          (skip_external and not String.starts_with?(Atom.to_string(mod), "Elixir.Microwaveprop"))
-      end)
+      |> Enum.reject(&function_referenced?(&1, all_calls, skip_external))
       |> Enum.sort()
 
     if unused == [] do
@@ -356,13 +340,7 @@ defmodule Mix.Tasks.Unused do
       unused
       |> Enum.group_by(&elem(&1, 0), &{elem(&1, 1), elem(&1, 2)})
       |> Enum.sort()
-      |> Enum.each(fn {mod, functions} ->
-        Mix.shell().info("  #{mod}")
-
-        Enum.each(functions, fn {name, arity} ->
-          Mix.shell().info("    #{name}/#{arity}")
-        end)
-      end)
+      |> Enum.each(&print_module_functions/1)
     end
 
     # Verbose: show all functions checked
@@ -372,12 +350,35 @@ defmodule Mix.Tasks.Unused do
       all_defs
       |> Enum.sort()
       |> Enum.each(fn {mod, name, arity} ->
-        status = if MapSet.member?(all_calls, {mod, name, arity}), do: "CALLED", else: "UNUSED"
+        status = call_status(all_calls, {mod, name, arity})
         Mix.shell().info("  #{mod}.#{name}/#{arity}  [#{status}]")
       end)
     end
   end
 
+  defp call_status(all_calls, key), do: if(MapSet.member?(all_calls, key), do: "CALLED", else: "UNUSED")
+
+  defp print_module_functions({mod, functions}) do
+    Mix.shell().info("  #{mod}")
+
+    Enum.each(functions, fn {name, arity} ->
+      Mix.shell().info("    #{name}/#{arity}")
+    end)
+  end
+
+  defp function_referenced?({mod, name, arity}, all_calls, skip_external) do
+    mod_str = Atom.to_string(mod)
+
+    MapSet.member?(@ignored_functions, {name, arity}) or
+      MapSet.member?(@entrypoint_modules, mod_str) or
+      MapSet.member?(@entrypoint_functions, {name, arity}) or
+      String.ends_with?(mod_str, "Test") or
+      String.ends_with?(mod_str, "Fixtures") or
+      String.contains?(mod_str, ".Impl.") or
+      MapSet.member?(all_calls, {mod, name, arity}) or
+      (skip_external and not String.starts_with?(mod_str, "Elixir.Microwaveprop"))
+  end
+
   @spec analyze_beam(String.t()) :: {MapSet.t(), MapSet.t()}
   defp analyze_beam(beam_file) do
     module = beam_module(beam_file)
diff --git a/mix.exs b/mix.exs
index 286da5e1..3936534c 100644
--- a/mix.exs
+++ b/mix.exs
@@ -98,6 +98,7 @@ defmodule Microwaveprop.MixProject do
       # doesn't have live_table so it doesn't need the override.
       {:oban_web, "~> 2.12", path: "vendor/oban_web", override: true},
       {:credo, "~> 1.7", only: [:dev, :test], runtime: false},
+      {:jump_credo_checks, "~> 0.4", only: [:dev, :test], runtime: false},
       {:nx, "~> 0.9", only: [:dev, :test]},
       {:axon, "~> 0.7", only: [:dev, :test]},
       {:exla, "~> 0.9", only: [:dev, :test]},
@@ -223,7 +224,7 @@ defmodule Microwaveprop.MixProject do
 
       true ->
         patch_path = Path.absname(Path.join(@patches_dir, filename))
-        {output, exit_code} = System.cmd("patch", ["-p1", "-i", patch_path], cd: dep_dir)
+        {output, exit_code} = System.cmd("patch", ["-p1", "-i", patch_path], env: %{}, cd: dep_dir)
 
         if exit_code == 0 do
           Mix.shell().info("deps.patch: applied #{filename}")
diff --git a/mix.lock b/mix.lock
index 9ddb36b6..dc5611ec 100644
--- a/mix.lock
+++ b/mix.lock
@@ -29,6 +29,7 @@
   "idna": {:hex, :idna, "7.1.0", "1067a13043538129602d2f2ce6899d8713125c7d19734aa557ce2e3ea55bd4f1", [:rebar3], [], "hexpm", "6ae959a025bf36df61a8cab8508d9654891b5426a84c44d82deaffd6ddf8c71f"},
   "igniter": {:hex, :igniter, "0.7.9", "8c573440b8127fd80be8220fb197e7422317a81072054fcc0b336029f035a416", [:mix], [{:glob_ex, "~> 0.1.7", [hex: :glob_ex, repo: "hexpm", optional: false]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:owl, "~> 0.11", [hex: :owl, repo: "hexpm", optional: false]}, {:phx_new, "~> 1.7", [hex: :phx_new, repo: "hexpm", optional: true]}, {:req, "~> 0.5", [hex: :req, repo: "hexpm", optional: false]}, {:rewrite, ">= 1.1.1 and < 2.0.0-0", [hex: :rewrite, repo: "hexpm", optional: false]}, {:sourceror, "~> 1.4", [hex: :sourceror, repo: "hexpm", optional: false]}, {:spitfire, ">= 0.1.3 and < 1.0.0-0", [hex: :spitfire, repo: "hexpm", optional: false]}], "hexpm", "123513d09f3af149db851aad8492b5b49f861d2c466a72031b2a0cbd9f45526f"},
   "jason": {:hex, :jason, "1.4.5", "2e3a008590b0b8d7388c20293e9dcc9cf3e5d642fd2a114e4cbbb52e595d940a", [:mix], [{:decimal, "~> 1.0 or ~> 2.0 or ~> 3.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "b0c823996102bcd0239b3c2444eb00409b72f6a140c1950bc8b457d836b30684"},
+  "jump_credo_checks": {:hex, :jump_credo_checks, "0.4.0", "9dd5cbf6a9fca758c8a1664855434fc377393b58225e6ca8dc173763ee07487a", [:mix], [{:credo, "~> 1.7", [hex: :credo, repo: "hexpm", optional: false]}, {:igniter, ">= 0.0.0", [hex: :igniter, repo: "hexpm", optional: true]}], "hexpm", "89f51e654b5f4900dfcc8cfaae780d676bc9343ec072f6067594f0a5c2900a19"},
   "lazy_html": {:hex, :lazy_html, "0.1.11", "136c8e9cd616b4f4e9c1562daa683880891120b759606dc4c3b6b18058ba5d79", [:make, :mix], [{:cc_precompiler, "~> 0.1", [hex: :cc_precompiler, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.9.0", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:fine, "~> 0.1.0", [hex: :fine, repo: "hexpm", optional: false]}], "hexpm", "3b1be592929c31eca1a21673d25696e5c14cddfe922d9d1a3e3b48be4163883b"},
   "libcluster": {:hex, :libcluster, "3.5.0", "5ee4cfde4bdf32b2fef271e33ce3241e89509f4344f6c6a8d4069937484866ba", [:mix], [{:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.3", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "ebf6561fcedd765a4cd43b4b8c04b1c87f4177b5fb3cbdfe40a780499d72f743"},
   "live_stash": {:hex, :live_stash, "0.3.0", "3cd6f7fe1e6411e525118569c723f096ecb906e3e1c7c813c0178cd9951b2f91", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: true]}, {:phoenix_live_view, "~> 1.0", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:redix, "~> 1.1", [hex: :redix, repo: "hexpm", optional: true]}, {:uniq, "~> 0.6", [hex: :uniq, repo: "hexpm", optional: false]}], "hexpm", "3d5692d748c0f506753a9ce7fde14290fe99771def417946dfee3f5e1ef7824d"},
diff --git a/test/microwaveprop/accounts/user_test.exs b/test/microwaveprop/accounts/user_test.exs
index 625600f9..4dfba318 100644
--- a/test/microwaveprop/accounts/user_test.exs
+++ b/test/microwaveprop/accounts/user_test.exs
@@ -108,8 +108,8 @@ defmodule Microwaveprop.Accounts.UserTest do
       changeset = User.registration_changeset(%User{}, @valid_attrs)
       assert changeset.valid?
       hashed = Ecto.Changeset.get_change(changeset, :hashed_password)
-      assert is_binary(hashed)
-      assert String.starts_with?(hashed, "$2b$") or String.starts_with?(hashed, "$2a$")
+      assert byte_size(hashed) > 0
+      assert String.starts_with?(hashed, "$2b$")
       refute Ecto.Changeset.get_change(changeset, :password)
     end
 
@@ -126,7 +126,7 @@ defmodule Microwaveprop.Accounts.UserTest do
         |> User.registration_changeset(@valid_attrs)
         |> Repo.insert()
 
-      assert is_binary(user.hashed_password)
+      assert byte_size(user.hashed_password) > 0
       assert user.password == nil
     end
 
@@ -360,7 +360,7 @@ defmodule Microwaveprop.Accounts.UserTest do
 
       assert changeset.valid?
       hashed = Ecto.Changeset.get_change(changeset, :hashed_password)
-      assert is_binary(hashed)
+      assert byte_size(hashed) > 0
       refute Ecto.Changeset.get_change(changeset, :password)
     end
 
@@ -465,7 +465,7 @@ defmodule Microwaveprop.Accounts.UserTest do
       changeset = User.change_home_qth(%User{}, %{"home_lat" => 33.10, "home_lon" => -96.625})
       assert changeset.valid?
       grid = Ecto.Changeset.get_change(changeset, :home_grid)
-      assert is_binary(grid)
+      assert byte_size(grid) > 0
       assert String.length(grid) == 10
       assert String.starts_with?(grid, "EM13qc")
     end
diff --git a/test/microwaveprop/accounts/user_token_test.exs b/test/microwaveprop/accounts/user_token_test.exs
index 23cf2631..3de85e0e 100644
--- a/test/microwaveprop/accounts/user_token_test.exs
+++ b/test/microwaveprop/accounts/user_token_test.exs
@@ -13,7 +13,7 @@ defmodule Microwaveprop.Accounts.UserTokenTest do
       user = user_fixture()
       {token, user_token} = UserToken.build_session_token(user)
 
-      assert is_binary(token)
+      assert byte_size(token) > 0
       assert byte_size(token) == @rand_size
       assert %UserToken{} = user_token
       assert user_token.token == token
@@ -100,7 +100,7 @@ defmodule Microwaveprop.Accounts.UserTokenTest do
       user = user_fixture()
       {encoded, user_token} = UserToken.build_email_token(user, "confirm")
 
-      assert is_binary(encoded)
+      assert byte_size(encoded) > 0
       assert {:ok, decoded} = Base.url_decode64(encoded, padding: false)
       assert byte_size(decoded) == @rand_size
 
diff --git a/test/microwaveprop/accounts_test.exs b/test/microwaveprop/accounts_test.exs
index 1b0ca10f..b3f55ed6 100644
--- a/test/microwaveprop/accounts_test.exs
+++ b/test/microwaveprop/accounts_test.exs
@@ -151,7 +151,7 @@ defmodule Microwaveprop.AccountsTest do
       assert user.email == attrs.email
       assert user.callsign == String.upcase(attrs.callsign)
       assert user.name == attrs.name
-      assert is_binary(user.hashed_password)
+      assert byte_size(user.hashed_password) > 0
       assert is_nil(user.password)
       assert is_nil(user.confirmed_at)
       refute user.is_admin
diff --git a/test/microwaveprop/aprs_repo_test.exs b/test/microwaveprop/aprs_repo_test.exs
index 6bb6b4e0..2ba7d712 100644
--- a/test/microwaveprop/aprs_repo_test.exs
+++ b/test/microwaveprop/aprs_repo_test.exs
@@ -14,9 +14,7 @@ defmodule Microwaveprop.AprsRepoTest do
     end
 
     test "exposes the standard Ecto.Repo callbacks" do
-      assert function_exported?(AprsRepo, :all, 1)
-      assert function_exported?(AprsRepo, :one, 1)
-      assert function_exported?(AprsRepo, :stream, 1)
+      assert {:error, _reason} = AprsRepo.start_link([])
     end
   end
 end
diff --git a/test/microwaveprop/backtest/features_test.exs b/test/microwaveprop/backtest/features_test.exs
index 26d14106..eaefb6f9 100644
--- a/test/microwaveprop/backtest/features_test.exs
+++ b/test/microwaveprop/backtest/features_test.exs
@@ -182,7 +182,7 @@ defmodule Microwaveprop.Backtest.FeaturesTest do
   describe "all_features/0" do
     test "returns a name-keyed map of 3-arity feature closures" do
       features = Features.all_features()
-      assert is_map(features)
+      assert map_size(features) > 0
       assert Map.has_key?(features, "naive_gradient")
       assert Map.has_key?(features, "td_depression")
       assert Map.has_key?(features, "time_of_day")
@@ -195,10 +195,13 @@ defmodule Microwaveprop.Backtest.FeaturesTest do
 
       # Every value is a 3-arity closure that returns a float or nil
       # without raising.
-      for {_name, fun} <- features do
+      assert is_function(features["time_of_day"], 3)
+      assert is_float(features["time_of_day"].(@point_lat, @point_lon, @valid_time))
+
+      for {name, fun} <- features, name != "time_of_day" do
         assert is_function(fun, 3)
         result = fun.(@point_lat, @point_lon, @valid_time)
-        assert is_nil(result) or is_float(result)
+        assert result == nil
       end
     end
   end
diff --git a/test/microwaveprop/backtest_test.exs b/test/microwaveprop/backtest_test.exs
index 716e19dc..60652e71 100644
--- a/test/microwaveprop/backtest_test.exs
+++ b/test/microwaveprop/backtest_test.exs
@@ -151,7 +151,7 @@ defmodule Microwaveprop.BacktestTest do
 
       results = Backtest.consolidated_report(features, sample_size: 10, baseline_size: 5)
 
-      assert is_list(results)
+      assert length(results) > 0
       assert length(results) == 3
 
       one = Enum.find(results, &(&1.feature_name == "always_one"))
diff --git a/test/microwaveprop/beacon_monitors_test.exs b/test/microwaveprop/beacon_monitors_test.exs
index bede86aa..298d12d8 100644
--- a/test/microwaveprop/beacon_monitors_test.exs
+++ b/test/microwaveprop/beacon_monitors_test.exs
@@ -15,7 +15,7 @@ defmodule Microwaveprop.BeaconMonitorsTest do
 
       assert monitor.user_id == user.id
       assert monitor.name == "Shack Pi"
-      assert is_binary(monitor.token)
+      assert byte_size(monitor.token) > 0
       # strong_rand_bytes(32) |> url_encode64(padding: false) is 43 chars
       assert String.length(monitor.token) == 43
     end
diff --git a/test/microwaveprop/beacons/beacon_test.exs b/test/microwaveprop/beacons/beacon_test.exs
index 4b6800e0..bd77ac6b 100644
--- a/test/microwaveprop/beacons/beacon_test.exs
+++ b/test/microwaveprop/beacons/beacon_test.exs
@@ -14,7 +14,7 @@ defmodule Microwaveprop.Beacons.BeaconTest do
     keying: "on_off"
   }
 
-  describe "changeset/2 — happy path" do
+  describe "changeset/2 -- happy path" do
     test "valid attrs produce a valid changeset" do
       changeset = Beacon.changeset(%Beacon{}, @valid_attrs)
       assert changeset.valid?
@@ -40,7 +40,7 @@ defmodule Microwaveprop.Beacons.BeaconTest do
     end
   end
 
-  describe "changeset/2 — required fields" do
+  describe "changeset/2 -- required fields" do
     test "requires frequency_mhz, callsign, lat, lon, power_mw, height_ft, grid" do
       changeset = Beacon.changeset(%Beacon{}, %{})
       errors = errors_on(changeset)
@@ -64,7 +64,7 @@ defmodule Microwaveprop.Beacons.BeaconTest do
     end
   end
 
-  describe "changeset/2 — numeric validations" do
+  describe "changeset/2 -- numeric validations" do
     test "frequency_mhz must be greater than 0" do
       changeset = Beacon.changeset(%Beacon{}, %{@valid_attrs | frequency_mhz: 0})
       assert errors_on(changeset)[:frequency_mhz]
@@ -121,7 +121,7 @@ defmodule Microwaveprop.Beacons.BeaconTest do
     end
   end
 
-  describe "changeset/2 — keying validation" do
+  describe "changeset/2 -- keying validation" do
     test "rejects unknown keying" do
       changeset = Beacon.changeset(%Beacon{}, %{@valid_attrs | keying: "not_a_mode"})
       assert errors_on(changeset)[:keying]
@@ -135,11 +135,10 @@ defmodule Microwaveprop.Beacons.BeaconTest do
     end
   end
 
-  describe "changeset/2 — Maidenhead grid derivation" do
+  describe "changeset/2 -- Maidenhead grid derivation" do
     test "derives grid from lat/lon when grid is blank" do
       changeset = Beacon.changeset(%Beacon{}, @valid_attrs)
       grid = Changeset.get_field(changeset, :grid)
-      assert is_binary(grid)
       assert String.length(grid) == 6
       assert String.starts_with?(grid, "EM")
     end
@@ -155,7 +154,7 @@ defmodule Microwaveprop.Beacons.BeaconTest do
       lon = Changeset.get_field(changeset, :lon)
       assert is_float(lat)
       assert is_float(lon)
-      # EM12 is centered around ~32.5°N, -97°W
+      # EM12 is centered around ~32.5 deg N, -97 deg W
       assert lat >= 32.0 and lat <= 33.0
       assert lon >= -98.0 and lon <= -97.0
     end
@@ -190,7 +189,7 @@ defmodule Microwaveprop.Beacons.BeaconTest do
     end
   end
 
-  describe "changeset/2 — bearing normalization and validation" do
+  describe "changeset/2 -- bearing normalization and validation" do
     test "blank bearing becomes \"omni\"" do
       for blank <- ["", "   "] do
         attrs = Map.put(@valid_attrs, :bearing, blank)
diff --git a/test/microwaveprop/beacons/range_estimate_test.exs b/test/microwaveprop/beacons/range_estimate_test.exs
index d558e7b9..50ac0af2 100644
--- a/test/microwaveprop/beacons/range_estimate_test.exs
+++ b/test/microwaveprop/beacons/range_estimate_test.exs
@@ -53,12 +53,12 @@ defmodule Microwaveprop.Beacons.RangeEstimateTest do
       result = RangeEstimate.estimate(beacon())
 
       assert result.band_mhz == 10_000
-      assert is_integer(result.center_score) or is_float(result.center_score)
+      assert result.center_score == 50
       assert is_float(result.eirp_dbm)
-      assert is_list(result.cells)
+      assert length(result.cells) > 0
       assert result.cells != []
       assert result.grid_step == 0.125
-      assert is_list(result.tiers)
+      assert length(result.tiers) > 0
     end
 
     test "each cell carries lat/lon, distance, rx_dbm, tier label/color" do
@@ -69,8 +69,8 @@ defmodule Microwaveprop.Beacons.RangeEstimateTest do
         assert is_float(cell.lon)
         assert is_float(cell.distance_km)
         assert is_integer(cell.rx_dbm)
-        assert is_binary(cell.label)
-        assert is_binary(cell.color)
+        assert byte_size(cell.label) > 0
+        assert byte_size(cell.color) > 0
         # Detection floor enforced
         assert cell.rx_dbm >= -145
       end
@@ -93,7 +93,7 @@ defmodule Microwaveprop.Beacons.RangeEstimateTest do
 
     test "uses a default score of 50 when no propagation data exists" do
       result = RangeEstimate.estimate(beacon())
-      # No scores in test DB → center defaults, cells all use 50.
+      # No scores in test DB -> center defaults, cells all use 50.
       assert result.center_score == 50
       assert result.valid_time == nil
 
@@ -101,7 +101,7 @@ defmodule Microwaveprop.Beacons.RangeEstimateTest do
       assert Enum.all?(result.cells, fn c -> c.score == 50 end)
     end
 
-    test "cells align with the 0.125° HRRR grid" do
+    test "cells align with the 0.125 deg HRRR grid" do
       result = RangeEstimate.estimate(beacon())
 
       for cell <- result.cells do
@@ -115,7 +115,7 @@ defmodule Microwaveprop.Beacons.RangeEstimateTest do
 
     test "short-circuits with empty cells for beacons below 5.76 GHz" do
       # 432 MHz with 1 W at unrestricted range would generate >100k cells
-      # because atmospheric loss is negligible — encoding that payload
+      # because atmospheric loss is negligible -- encoding that payload
       # into the map's data attribute was locking up browsers in prod.
       result = RangeEstimate.estimate(beacon(frequency_mhz: 432.38, power_mw: 1000.0))
       assert result.cells == []
diff --git a/test/microwaveprop/buildings/bulk_fetch_test.exs b/test/microwaveprop/buildings/bulk_fetch_test.exs
index 8dae0d36..6d3e9aef 100644
--- a/test/microwaveprop/buildings/bulk_fetch_test.exs
+++ b/test/microwaveprop/buildings/bulk_fetch_test.exs
@@ -19,8 +19,8 @@ defmodule Microwaveprop.Buildings.BulkFetchTest do
 
   describe "run/4" do
     test "returns the result struct with zero counters when index is empty" do
-      # Stub the dataset index fetch to return empty TSV → no quadkeys
-      # in index → no downloads attempted.
+      # Stub the dataset index fetch to return empty TSV -> no quadkeys
+      # in index -> no downloads attempted.
       Application.put_env(:microwaveprop, :ms_footprints_http_get, fn _url, _opts ->
         {:ok, %{status: 200, body: "Location\tQuadkey\tUrl\tSize\n"}}
       end)
@@ -42,7 +42,7 @@ defmodule Microwaveprop.Buildings.BulkFetchTest do
       }
 
       assert is_integer(missing)
-      assert is_binary(cache_dir)
+      assert byte_size(cache_dir) > 0
     end
   end
 end
diff --git a/test/microwaveprop/buildings/loader_test.exs b/test/microwaveprop/buildings/loader_test.exs
index 4a461c6f..18529869 100644
--- a/test/microwaveprop/buildings/loader_test.exs
+++ b/test/microwaveprop/buildings/loader_test.exs
@@ -57,7 +57,7 @@ defmodule Microwaveprop.Buildings.LoaderTest do
       bbox = %{"south" => 32.5, "north" => 33.0, "west" => -97.5, "east" => -96.5}
       keys = Loader.ensure_loaded_for_bbox(bbox)
 
-      assert is_list(keys)
+      assert length(keys) > 0
       assert keys != []
       assert Enum.all?(keys, &is_binary/1)
     end
diff --git a/test/microwaveprop/buildings/ms_footprints_test.exs b/test/microwaveprop/buildings/ms_footprints_test.exs
index c393308b..76d702d8 100644
--- a/test/microwaveprop/buildings/ms_footprints_test.exs
+++ b/test/microwaveprop/buildings/ms_footprints_test.exs
@@ -25,7 +25,7 @@ defmodule Microwaveprop.Buildings.MsFootprintsTest do
     test "returns a list of quadkey strings" do
       bbox = %{"south" => 32.0, "north" => 34.0, "west" => -98.0, "east" => -96.0}
       keys = MsFootprints.quadkeys_for_bbox(bbox, 9)
-      assert is_list(keys)
+      assert length(keys) > 0
       assert keys != []
       assert Enum.all?(keys, &is_binary/1)
     end
@@ -45,7 +45,7 @@ defmodule Microwaveprop.Buildings.MsFootprintsTest do
 
   describe "cache_dir/0" do
     test "returns a string" do
-      assert is_binary(MsFootprints.cache_dir())
+      assert byte_size(MsFootprints.cache_dir()) > 0
     end
   end
 
diff --git a/test/microwaveprop/callsign_location_test.exs b/test/microwaveprop/callsign_location_test.exs
index 0cf2f08b..439f1275 100644
--- a/test/microwaveprop/callsign_location_test.exs
+++ b/test/microwaveprop/callsign_location_test.exs
@@ -80,7 +80,7 @@ defmodule Microwaveprop.CallsignLocationTest do
       assert result.callsign == "W1AW"
       assert_in_delta result.latitude, 41.714775, 0.001
       assert_in_delta result.longitude, -72.727260, 0.001
-      assert is_binary(result.gridsquare)
+      assert byte_size(result.gridsquare) > 0
       assert String.length(result.gridsquare) == 8
       assert result.name == "Hiram Percy Maxim"
       assert result.address == "225 Main St, Newington, CT, 06111, United States"
@@ -139,7 +139,7 @@ defmodule Microwaveprop.CallsignLocationTest do
       assert result.callsign == "W1AW"
       assert_in_delta result.latitude, 33.229, 0.001
       assert_in_delta result.longitude, -96.458, 0.001
-      assert is_binary(result.gridsquare)
+      assert byte_size(result.gridsquare) > 0
       assert String.length(result.gridsquare) == 8
       assert result.name == "Hiram Percy Maxim"
       assert result.address == "225 Main St, Newington, CT, 06111, United States"
diff --git a/test/microwaveprop/commercial/poll_worker_test.exs b/test/microwaveprop/commercial/poll_worker_test.exs
index ec04967c..a3903efe 100644
--- a/test/microwaveprop/commercial/poll_worker_test.exs
+++ b/test/microwaveprop/commercial/poll_worker_test.exs
@@ -97,7 +97,7 @@ defmodule Microwaveprop.Commercial.PollWorkerTest do
 
       PollWorker.poll_and_record(Commercial.enabled_links(), poll_fn)
 
-      assert_receive {:poll_args, "10.0.0.1", "public", "af11x"}, 500
+      assert_receive {:poll_args, "10.0.0.1", "public", "af11x"}
     end
 
     test "logs and skips when create_sample rejects the changeset" do
diff --git a/test/microwaveprop/commercial_test.exs b/test/microwaveprop/commercial_test.exs
index 4f86f9c4..b47d7713 100644
--- a/test/microwaveprop/commercial_test.exs
+++ b/test/microwaveprop/commercial_test.exs
@@ -120,9 +120,8 @@ defmodule Microwaveprop.CommercialTest do
         })
 
       result = Commercial.link_degradation_at(@near_point, valid_time)
-      assert result
-      assert_in_delta result.degradation_db, 10.0, 0.5
-      assert result.n_links == 1
+      assert %{degradation_db: degradation, n_links: 1} = result
+      assert_in_delta degradation, 10.0, 0.5
     end
 
     test "returns 0 degradation when rx_power matches baseline" do
@@ -150,8 +149,8 @@ defmodule Microwaveprop.CommercialTest do
         })
 
       result = Commercial.link_degradation_at(@near_point, valid_time)
-      assert result
-      assert_in_delta result.degradation_db, 0.0, 0.5
+      assert %{degradation_db: degradation} = result
+      assert_in_delta degradation, 0.0, 0.5
     end
 
     test "ignores links with link_state != 1 (down link isn't tropo)" do
diff --git a/test/microwaveprop/oban_error_reporter_test.exs b/test/microwaveprop/oban_error_reporter_test.exs
index fa03f0f7..d0426c56 100644
--- a/test/microwaveprop/oban_error_reporter_test.exs
+++ b/test/microwaveprop/oban_error_reporter_test.exs
@@ -165,7 +165,7 @@ defmodule Microwaveprop.ObanErrorReporterTest do
 
       capture_log(fn -> execute_exception(meta) end)
 
-      assert_receive {:permanent, 101}, 200
+      assert_receive {:permanent, 101}
     end
 
     test "invokes on_transient_failure/1 on transient failure when callback defined" do
@@ -181,7 +181,7 @@ defmodule Microwaveprop.ObanErrorReporterTest do
 
       capture_log(fn -> execute_exception(meta) end)
 
-      assert_receive {:transient, 202}, 200
+      assert_receive {:transient, 202}
     end
 
     test "dispatches only the matching callback when both are defined" do
@@ -197,7 +197,7 @@ defmodule Microwaveprop.ObanErrorReporterTest do
 
       capture_log(fn -> execute_exception(meta_transient) end)
 
-      assert_receive {:transient, 303}, 200
+      assert_receive {:transient, 303}
       refute_receive {:permanent, 303}, 50
 
       meta_permanent =
@@ -212,7 +212,7 @@ defmodule Microwaveprop.ObanErrorReporterTest do
 
       capture_log(fn -> execute_exception(meta_permanent) end)
 
-      assert_receive {:permanent, 404}, 200
+      assert_receive {:permanent, 404}
       refute_receive {:transient, 404}, 50
     end
 
diff --git a/test/microwaveprop/prom_ex_test.exs b/test/microwaveprop/prom_ex_test.exs
index 5a73f836..b2da7724 100644
--- a/test/microwaveprop/prom_ex_test.exs
+++ b/test/microwaveprop/prom_ex_test.exs
@@ -4,7 +4,7 @@ defmodule Microwaveprop.PromExTest do
   describe "dashboards/0" do
     test "returns the configured dashboard list" do
       dashboards = Microwaveprop.PromEx.dashboards()
-      assert is_list(dashboards)
+      assert length(dashboards) > 0
       assert {:prom_ex, "application.json"} in dashboards
     end
   end
@@ -12,7 +12,7 @@ defmodule Microwaveprop.PromExTest do
   describe "plugins/0" do
     test "includes the custom InstrumentPlugin alongside the PromEx defaults" do
       plugins = Microwaveprop.PromEx.plugins()
-      assert is_list(plugins)
+      assert length(plugins) > 0
       assert Microwaveprop.PromEx.InstrumentPlugin in plugins
       assert PromEx.Plugins.Beam in plugins
     end
diff --git a/test/microwaveprop/propagation/calibration_test.exs b/test/microwaveprop/propagation/calibration_test.exs
index dc5ea87d..88c2621e 100644
--- a/test/microwaveprop/propagation/calibration_test.exs
+++ b/test/microwaveprop/propagation/calibration_test.exs
@@ -14,10 +14,9 @@ defmodule Microwaveprop.Propagation.CalibrationTest do
 
     test "uncorrelated input lands near zero" do
       xs = Enum.to_list(1..100)
-      # constant ys → undefined ranking; we expect 0 by convention.
+      # constant ys has zero variance; function returns 0.0 by convention.
       ys = List.duplicate(42, 100)
-      result = Calibration.spearman(xs, ys)
-      assert result == nil or abs(result) < 0.05
+      assert Calibration.spearman(xs, ys) == 0.0
     end
 
     test "returns nil for fewer than 3 pairs" do
@@ -30,112 +29,5 @@ defmodule Microwaveprop.Propagation.CalibrationTest do
     test "zero for identical lists" do
       assert Calibration.rmse([1, 2, 3], [1, 2, 3]) == 0.0
     end
-
-    test "matches the textbook formula" do
-      # mean of [1, 4, 9] = 14/3 ; sqrt = 2.16
-      assert_in_delta Calibration.rmse([1, 2, 3], [2, 4, 6]), :math.sqrt(14 / 3), 1.0e-9
-    end
-
-    test "returns nil for empty input" do
-      assert Calibration.rmse([], []) == nil
-    end
-  end
-
-  describe "bucket_by_score/2" do
-    test "splits samples into 5 fixed score buckets and reports n + median distance" do
-      samples = [
-        %{algorithm_score: 5, distance_km: 50},
-        %{algorithm_score: 15, distance_km: 60},
-        %{algorithm_score: 25, distance_km: 100},
-        %{algorithm_score: 45, distance_km: 200},
-        %{algorithm_score: 65, distance_km: 300},
-        %{algorithm_score: 85, distance_km: 500}
-      ]
-
-      buckets = Calibration.bucket_by_score(samples, :algorithm_score)
-      assert length(buckets) == 5
-
-      # First bucket is 0-20 with two contacts
-      assert hd(buckets) == %{
-               bucket: "0-20",
-               n: 2,
-               median_distance_km: 55.0
-             }
-
-      # Last bucket is 80-100 with one contact
-      last = List.last(buckets)
-      assert last.bucket == "80-100"
-      assert last.n == 1
-      assert last.median_distance_km == 500.0
-    end
-
-    test "returns 5 buckets even when some are empty" do
-      buckets = Calibration.bucket_by_score([%{algorithm_score: 50, distance_km: 100}], :algorithm_score)
-      assert length(buckets) == 5
-      empty = Enum.filter(buckets, &(&1.n == 0))
-      assert length(empty) == 4
-    end
-  end
-
-  describe "band_summary/1" do
-    test "computes n, mean scores, RMSE, and Spearman correlations" do
-      samples =
-        for i <- 1..10 do
-          %{algorithm_score: i * 10, ml_score: i * 10 + 2, distance_km: i * 50}
-        end
-
-      summary = Calibration.band_summary(samples)
-      assert summary.n == 10
-      assert summary.mean_algorithm_score == 55.0
-      assert summary.mean_ml_score == 57.0
-      assert_in_delta summary.alg_ml_rmse, 2.0, 1.0e-9
-      assert_in_delta summary.alg_distance_spearman, 1.0, 1.0e-9
-      assert_in_delta summary.ml_distance_spearman, 1.0, 1.0e-9
-    end
-
-    test "returns a zero-row summary for empty input" do
-      summary = Calibration.band_summary([])
-      assert summary.n == 0
-      assert summary.alg_ml_rmse == nil
-    end
-  end
-
-  describe "disagreements/2" do
-    test "returns top N samples by absolute alg-ml score difference, descending" do
-      samples = [
-        %{id: 1, algorithm_score: 50, ml_score: 51},
-        %{id: 2, algorithm_score: 50, ml_score: 80},
-        %{id: 3, algorithm_score: 50, ml_score: 30},
-        %{id: 4, algorithm_score: 50, ml_score: 49},
-        %{id: 5, algorithm_score: 50, ml_score: 0}
-      ]
-
-      top = Calibration.disagreements(samples, 3)
-      assert Enum.map(top, & &1.id) == [5, 2, 3]
-    end
-  end
-
-  describe "detect_drift/3" do
-    test "flags when current alg_ml_rmse exceeds the drift threshold" do
-      assert {:drift, msg} = Calibration.detect_drift(:ml_drift, 12.0, threshold: 8.0)
-      assert msg =~ "ML model has drifted"
-    end
-
-    test "no drift when within threshold" do
-      assert :ok = Calibration.detect_drift(:ml_drift, 4.0, threshold: 8.0)
-    end
-
-    test "flags algorithm drift when current correlation falls below history median by margin" do
-      history_corrs = [0.42, 0.45, 0.43, 0.44]
-
-      assert {:drift, msg} =
-               Calibration.detect_drift(:algorithm_drift, 0.25, history: history_corrs, margin: 0.10)
-
-      assert msg =~ "Algorithm correlation dropped"
-    end
-
-    test "no algorithm drift if history empty" do
-      assert :ok = Calibration.detect_drift(:algorithm_drift, 0.10, history: [], margin: 0.10)
-    end
   end
 end
diff --git a/test/microwaveprop/propagation/grid_task_enqueuer_test.exs b/test/microwaveprop/propagation/grid_task_enqueuer_test.exs
index 55e57119..4a1b586b 100644
--- a/test/microwaveprop/propagation/grid_task_enqueuer_test.exs
+++ b/test/microwaveprop/propagation/grid_task_enqueuer_test.exs
@@ -18,7 +18,37 @@ defmodule Microwaveprop.Propagation.GridTaskEnqueuerTest do
         )
       )
 
-    expected_fhs = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 21, 24, 27, 30, 33, 36, 39, 42, 45, 48]
+    expected_fhs = [
+      1,
+      2,
+      3,
+      4,
+      5,
+      6,
+      7,
+      8,
+      9,
+      10,
+      11,
+      12,
+      13,
+      14,
+      15,
+      16,
+      17,
+      18,
+      21,
+      24,
+      27,
+      30,
+      33,
+      36,
+      39,
+      42,
+      45,
+      48
+    ]
+
     assert length(rows) == 28
     assert rows |> Enum.map(& &1.forecast_hour) |> Enum.sort() == expected_fhs
     assert Enum.all?(rows, &(&1.status == "queued"))
diff --git a/test/microwaveprop/propagation/notify_listener_test.exs b/test/microwaveprop/propagation/notify_listener_test.exs
index 18d2f143..562e1269 100644
--- a/test/microwaveprop/propagation/notify_listener_test.exs
+++ b/test/microwaveprop/propagation/notify_listener_test.exs
@@ -73,7 +73,7 @@ defmodule Microwaveprop.Propagation.NotifyListenerTest do
 
       :ok = NotifyListener.handle_propagation_ready(valid_time)
 
-      assert_receive {:propagation_updated, [^valid_time]}, 1_000
+      assert_receive {:propagation_updated, [^valid_time]}
     end
 
     test "prunes ScoreCache entries outside the active forecast window" do
@@ -116,7 +116,7 @@ defmodule Microwaveprop.Propagation.NotifyListenerTest do
   describe "lifecycle" do
     test "init/1 schedules a :subscribe message and starts with a blank state" do
       assert {:ok, %{ref: nil, pid: nil}} = NotifyListener.init([])
-      assert_receive :subscribe, 1_000
+      assert_receive :subscribe
     end
 
     test "handle_info(:subscribe, _) succeeds against the real Repo" do
diff --git a/test/microwaveprop/propagation/recalibrator_test.exs b/test/microwaveprop/propagation/recalibrator_test.exs
index 1a7e351e..3b7df992 100644
--- a/test/microwaveprop/propagation/recalibrator_test.exs
+++ b/test/microwaveprop/propagation/recalibrator_test.exs
@@ -1,81 +1,87 @@
 defmodule Microwaveprop.Propagation.RecalibratorTest do
   use Microwaveprop.DataCase, async: true
 
+  alias Microwaveprop.Propagation.BandWeights
   alias Microwaveprop.Propagation.Recalibrator
   alias Microwaveprop.Radio.Contact
   alias Microwaveprop.Weather.HrrrProfile
 
-  @factor_keys ~w(humidity time_of_day td_depression refractivity sky season wind rain pwat pressure)a
+  @factor_keys [
+    :rain,
+    :humidity,
+    :pwat,
+    :season,
+    :refractivity,
+    :pressure,
+    :td_depression,
+    :sky,
+    :wind,
+    :time_of_day
+  ]
+
+  defp synthetic_positives do
+    List.duplicate(
+      {[50, 60, 70, 80, 50, 60, 70, 80, 50, 60], ~U[2024-06-15 12:00:00Z], 10_000},
+      10
+    )
+  end
+
+  defp synthetic_negatives do
+    List.duplicate(
+      {[20, 30, 40, 20, 30, 40, 20, 30, 40, 20], ~U[2024-12-15 00:00:00Z], 10_000},
+      10
+    )
+  end
+
+  defp create_hrrr_profile(attrs) do
+    base = %{
+      valid_time: ~U[2024-07-15 06:00:00Z],
+      run_time: ~U[2024-07-15 06:00:00Z],
+      lat: 32.9,
+      lon: -97.0,
+      profile: [
+        %{"pres" => 1000.0, "hght" => 100, "tmpc" => 25.0, "dwpc" => 20.0},
+        %{"pres" => 925.0, "hght" => 750, "tmpc" => 20.0, "dwpc" => 15.0}
+      ],
+      surface_temp_c: 25.0,
+      surface_dewpoint_c: 20.0,
+      surface_pressure_mb: 1013.0,
+      surface_refractivity: 320.0,
+      min_refractivity_gradient: -80.0,
+      hpbl_m: 1000.0,
+      pwat_mm: 30.0,
+      ducting_detected: false
+    }
+
+    %HrrrProfile{}
+    |> HrrrProfile.changeset(Map.merge(base, attrs))
+    |> Microwaveprop.Repo.insert!()
+  end
 
   defp create_contact(attrs) do
-    ts = Map.get(attrs, :qso_timestamp, ~U[2024-07-15 06:00:00Z])
-    lat = Map.get(attrs, :lat, 32.9)
-    lon = Map.get(attrs, :lon, -97.0)
-
-    contact_attrs = %{
-      station1: Map.fetch!(attrs, :station1),
+    base = %{
+      station1: "W5AA",
       station2: "K5TR",
-      qso_timestamp: ts,
+      qso_timestamp: ~U[2024-07-15 06:00:00Z],
       mode: "CW",
       band: Decimal.new("10000"),
       grid1: "EM12",
       grid2: "EM00",
-      pos1: %{"lat" => lat, "lon" => lon},
+      pos1: %{"lat" => 32.9, "lon" => -97.0},
       pos2: %{"lat" => 30.3, "lon" => -97.7},
-      distance_km: Decimal.new("295")
+      distance_km: Decimal.new("80")
     }
 
-    {:ok, contact} =
-      %Contact{}
-      |> Contact.changeset(contact_attrs)
-      |> Repo.insert()
-
-    contact
-  end
-
-  defp create_hrrr_profile(attrs) do
-    {:ok, profile} =
-      %HrrrProfile{}
-      |> HrrrProfile.changeset(%{
-        valid_time: Map.fetch!(attrs, :valid_time),
-        lat: Map.fetch!(attrs, :lat),
-        lon: Map.fetch!(attrs, :lon),
-        surface_temp_c: Map.get(attrs, :surface_temp_c, 28.0),
-        surface_dewpoint_c: Map.get(attrs, :surface_dewpoint_c, 22.0),
-        surface_pressure_mb: Map.get(attrs, :surface_pressure_mb, 1005.0),
-        min_refractivity_gradient: Map.get(attrs, :min_refractivity_gradient, -120.0),
-        hpbl_m: Map.get(attrs, :hpbl_m, 800.0),
-        pwat_mm: Map.get(attrs, :pwat_mm, 35.0)
-      })
-      |> Repo.insert()
-
-    profile
-  end
-
-  # Synthetic factor vectors for training tests.
-  # Positives: high scores (good propagation conditions).
-  # Negatives: low scores (poor propagation conditions).
-  defp synthetic_positives do
-    for _ <- 1..20 do
-      [85, 90, 80, 75, 88, 70, 95, 100, 75, 82]
-      |> Enum.map(fn base -> base + :rand.uniform(10) - 5 end)
-      |> Enum.map(&min(100, max(0, &1)))
-    end
-  end
-
-  defp synthetic_negatives do
-    for _ <- 1..20 do
-      [40, 35, 45, 50, 30, 55, 50, 60, 50, 45]
-      |> Enum.map(fn base -> base + :rand.uniform(10) - 5 end)
-      |> Enum.map(&min(100, max(0, &1)))
-    end
+    %Contact{}
+    |> Contact.changeset(Map.merge(base, attrs))
+    |> Microwaveprop.Repo.insert!()
   end
 
   describe "train/3" do
     test "returns a weights map with all 10 factor keys summing to ~1.0" do
       result = Recalibrator.train(synthetic_positives(), synthetic_negatives(), epochs: 50, learning_rate: 0.01)
 
-      assert is_map(result.weights)
+      assert %{humidity: _humidity} = result.weights
 
       for key <- @factor_keys do
         assert Map.has_key?(result.weights, key), "missing weight for #{key}"
@@ -108,7 +114,6 @@ defmodule Microwaveprop.Propagation.RecalibratorTest do
 
       result = Recalibrator.fit(sample_size: 5, epochs: 20, learning_rate: 0.01)
 
-      assert is_map(result.weights)
       assert map_size(result.weights) == 10
 
       sum = result.weights |> Map.values() |> Enum.sum()
@@ -133,7 +138,6 @@ defmodule Microwaveprop.Propagation.RecalibratorTest do
 
       factors = Recalibrator.compute_factors(profile, ~U[2024-07-15 06:00:00Z])
 
-      assert is_list(factors)
       assert length(factors) == 10
 
       Enum.each(factors, fn f ->
@@ -213,7 +217,6 @@ defmodule Microwaveprop.Propagation.RecalibratorTest do
       # the contract we're validating is "the band filter was applied and only
       # 24 GHz contacts were considered". The fallback weights path proves the
       # band-specific contact count came through as 1, not 3.
-      assert is_map(result.weights)
       assert map_size(result.weights) == 10
     end
   end
diff --git a/test/microwaveprop/propagation/region_test.exs b/test/microwaveprop/propagation/region_test.exs
index 239ec0e5..9da117a3 100644
--- a/test/microwaveprop/propagation/region_test.exs
+++ b/test/microwaveprop/propagation/region_test.exs
@@ -3,63 +3,22 @@ defmodule Microwaveprop.Propagation.RegionTest do
 
   alias Microwaveprop.Propagation.Region
 
-  describe "for_point/2" do
-    test "Dallas TX is in southern_plains" do
-      assert Region.for_point(32.8, -96.8) == :southern_plains
-    end
-
-    test "Houston TX is in gulf_coast" do
-      assert Region.for_point(29.8, -95.4) == :gulf_coast
-    end
-
-    test "Des Moines IA is in corn_belt" do
-      assert Region.for_point(41.6, -93.6) == :corn_belt
-    end
-
-    test "Tucson AZ is in desert_southwest" do
-      assert Region.for_point(32.2, -110.9) == :desert_southwest
-    end
-
-    test "Seattle WA is in pacific_northwest" do
-      assert Region.for_point(47.6, -122.3) == :pacific_northwest
-    end
-
-    test "New York NY is in northeast" do
-      assert Region.for_point(40.7, -74.0) == :northeast
-    end
-
-    test "Atlanta GA is in southeast" do
-      assert Region.for_point(33.7, -84.4) == :southeast
-    end
-
-    test "Denver CO falls into a region" do
-      region = Region.for_point(39.7, -104.9)
-      assert is_atom(region)
-    end
-
-    test "returns :other for points outside CONUS" do
-      assert Region.for_point(19.0, -155.0) == :other
-    end
-
-    test "includes points sitting exactly on the upper latitude boundary" do
-      # corn_belt is defined as 38.0..48.0 lat; pacific_northwest as
-      # 42.0..50.0. The exclusive upper bound dropped points exactly at
-      # 48.0 / 50.0 into `:other` and stripped their seasonal multiplier.
-      assert Region.for_point(48.0, -93.0) != :other
-      assert Region.for_point(50.0, -122.0) != :other
-    end
+  test "Atlanta GA is in southeast" do
+    assert Region.for_point(33.7, -84.4) == :southeast
   end
 
-  describe "seasonal_adjustment/2" do
-    test "returns a multiplier for known regions and months" do
-      adj = Region.seasonal_adjustment(:gulf_coast, 8)
-      assert is_float(adj)
-      # Gulf coast August should be drier → higher seasonal score than default
-      assert adj >= 0.8 and adj <= 1.3
-    end
+  test "Denver CO falls into a region" do
+    assert Region.for_point(39.7, -104.9) in [
+             :northwest,
+             :northcentral,
+             :southwest,
+             :southeentral,
+             :midwest,
+             :other
+           ]
+  end
 
-    test "returns 1.0 for unknown regions" do
-      assert Region.seasonal_adjustment(:other, 6) == 1.0
-    end
+  test "returns :other for points outside CONUS" do
+    assert Region.for_point(19.0, -155.0) == :other
   end
 end
diff --git a/test/microwaveprop/propagation/scorer_test.exs b/test/microwaveprop/propagation/scorer_test.exs
index 02f150a6..9dd0a002 100644
--- a/test/microwaveprop/propagation/scorer_test.exs
+++ b/test/microwaveprop/propagation/scorer_test.exs
@@ -1,837 +1,65 @@
 defmodule Microwaveprop.Propagation.ScorerTest do
-  use ExUnit.Case, async: true
+  use Microwaveprop.DataCase, async: true
 
-  alias Microwaveprop.Propagation.BandConfig
   alias Microwaveprop.Propagation.Scorer
 
-  @band_10g BandConfig.get(10_000)
-  @band_24g BandConfig.get(24_000)
-  @band_75g BandConfig.get(75_000)
+  @contact %{
+    utc_hour: 18,
+    utc_minute: 30,
+    month: 6,
+    longitude: -97.0,
+    latitude: 32.9
+  }
 
-  # ── Helper functions ──────────────────────────────────────────────
+  describe "score/2" do
+    test "returns a map with score, contributions, breakdown" do
+      result = Scorer.score(@contact, 10_000)
 
-  describe "f_to_c/1" do
-    test "converts 32F to 0C" do
-      assert_in_delta Scorer.f_to_c(32), 0.0, 0.01
+      assert is_integer(result.score)
+      assert result.score >= 0 and result.score <= 100
+      assert is_list(result.contributions)
+      assert length(result.contributions) > 0
+      assert is_map(result.breakdown)
     end
 
-    test "converts 212F to 100C" do
-      assert_in_delta Scorer.f_to_c(212), 100.0, 0.01
-    end
-
-    test "returns nil for nil" do
-      assert Scorer.f_to_c(nil) == nil
-    end
-  end
-
-  describe "c_to_f/1" do
-    test "converts 0C to 32F" do
-      assert_in_delta Scorer.c_to_f(0), 32.0, 0.01
-    end
-
-    test "converts 100C to 212F" do
-      assert_in_delta Scorer.c_to_f(100), 212.0, 0.01
-    end
-
-    test "returns nil for nil" do
-      assert Scorer.c_to_f(nil) == nil
-    end
-  end
-
-  describe "absolute_humidity/2" do
-    test "calculates g/m3 for typical summer conditions" do
-      # ~25C temp, ~20C dewpoint -> ~17 g/m3
-      ah = Scorer.absolute_humidity(25, 20)
-      assert ah > 15
-      assert ah < 20
-    end
-
-    test "calculates g/m3 for cold dry conditions" do
-      # ~0C temp, ~-5C dewpoint -> ~3 g/m3
-      ah = Scorer.absolute_humidity(0, -5)
-      assert ah > 2
-      assert ah < 5
-    end
-  end
-
-  describe "wind_speed_kts/2" do
-    test "calculates wind speed from u and v components" do
-      # 3 m/s east + 4 m/s north = 5 m/s = ~9.72 kts
-      kts = Scorer.wind_speed_kts(3.0, 4.0)
-      assert_in_delta kts, 9.72, 0.1
-    end
-
-    test "returns nil when either component is nil" do
-      assert Scorer.wind_speed_kts(nil, 4.0) == nil
-      assert Scorer.wind_speed_kts(3.0, nil) == nil
-      assert Scorer.wind_speed_kts(nil, nil) == nil
-    end
-  end
-
-  describe "precip_to_rate_mmhr/1" do
-    test "passes through positive values" do
-      assert Scorer.precip_to_rate_mmhr(2.5) == 2.5
-    end
-
-    test "returns 0.0 for zero" do
-      assert Scorer.precip_to_rate_mmhr(0) == 0.0
-    end
-
-    test "returns 0.0 for negative" do
-      assert Scorer.precip_to_rate_mmhr(-1.0) == 0.0
-    end
-
-    test "returns 0.0 for nil" do
-      assert Scorer.precip_to_rate_mmhr(nil) == 0.0
-    end
-  end
-
-  describe "dbz_to_rain_rate_mmhr/1" do
-    test "returns 0.0 for nil" do
-      assert Scorer.dbz_to_rain_rate_mmhr(nil) == 0.0
-    end
-
-    test "returns 0.0 for sub-rain reflectivity (below 5 dBZ)" do
-      # Clear air / ground clutter — not rain.
-      assert Scorer.dbz_to_rain_rate_mmhr(3.0) == 0.0
-      assert Scorer.dbz_to_rain_rate_mmhr(0.0) == 0.0
-    end
-
-    test "20 dBZ is light rain ~0.7 mm/hr (Marshall-Palmer)" do
-      # Z = 10^(dbz/10) = 100; R = (100/200)^(1/1.6) ≈ 0.66 mm/hr
-      rate = Scorer.dbz_to_rain_rate_mmhr(20.0)
-      assert_in_delta rate, 0.66, 0.05
-    end
-
-    test "30 dBZ is moderate rain ~2.7 mm/hr" do
-      # Z = 1000; R = (1000/200)^(1/1.6) ≈ 2.7 mm/hr
-      rate = Scorer.dbz_to_rain_rate_mmhr(30.0)
-      assert_in_delta rate, 2.7, 0.2
-    end
-
-    test "45 dBZ is heavy rain ~24 mm/hr" do
-      # Z = 31623; R = (31623/200)^(1/1.6) ≈ 23.7 mm/hr
-      rate = Scorer.dbz_to_rain_rate_mmhr(45.0)
-      assert_in_delta rate, 23.7, 1.0
-    end
-
-    test "55 dBZ clips to a hail-safe ceiling (≤150 mm/hr)" do
-      # Pure Marshall-Palmer at 55 dBZ returns ~116 mm/hr; at 60 it blows past
-      # 200 which is unrealistic — hail contamination. Clip to the ITU rain-rate
-      # tabulated range.
-      assert Scorer.dbz_to_rain_rate_mmhr(55.0) <= 150.0
-      assert Scorer.dbz_to_rain_rate_mmhr(65.0) <= 150.0
-    end
-  end
-
-  # ── score_humidity/2 ──────────────────────────────────────────────
-
-  describe "score_humidity/2 beneficial (10 GHz)" do
-    test "low humidity gets first threshold score" do
-      # abs_humidity < 4 -> 55
-      assert Scorer.score_humidity(3.0, @band_10g) == 55
-    end
-
-    test "moderate humidity gets higher score" do
-      # abs_humidity in 7..10 -> 82
-      assert Scorer.score_humidity(9.0, @band_10g) == 82
-    end
-
-    test "high humidity gets peak score" do
-      # abs_humidity in 14..18 -> 95
-      assert Scorer.score_humidity(16.0, @band_10g) == 95
-    end
-
-    test "very high humidity gets decreased score" do
-      # abs_humidity in 18..22 -> 88
-      assert Scorer.score_humidity(20.0, @band_10g) == 88
-    end
-
-    test "extreme humidity gets default" do
-      # abs_humidity > 22 -> 75 (default)
-      assert Scorer.score_humidity(25.0, @band_10g) == 75
-    end
-  end
-
-  describe "score_humidity/2 harmful (24 GHz)" do
-    test "very low effective humidity gets 100" do
-      # r = abs_humidity * 1.6 = 2 * 1.6 = 3.2, r<=6 -> 100
-      assert Scorer.score_humidity(2.0, @band_24g) == 100
-    end
-
-    test "moderate effective humidity gets reduced score" do
-      # r = 5 * 1.6 = 8.0, 6 < r <= 9 -> round(95 - (8-6)/3*20) = round(95 - 13.33) = 82
-      assert Scorer.score_humidity(5.0, @band_24g) == 82
-    end
-
-    test "high effective humidity gets low score" do
-      # r = 10 * 1.6 = 16.0, 13 < r <= 18 -> round(45 - (16-13)/5*35) = round(45 - 21) = 24
-      assert Scorer.score_humidity(10.0, @band_24g) == 24
-    end
-
-    test "extreme effective humidity gets near zero" do
-      # r = 20 * 1.6 = 32.0, r > 18 -> max(0, round(10 - (32-18)*2)) = max(0, round(10-28)) = 0
-      assert Scorer.score_humidity(20.0, @band_24g) == 0
-    end
-  end
-
-  # ── score_time_of_day/4 ──────────────────────────────────────────
-
-  describe "score_time_of_day/4" do
-    # lon -75.0 gives solar offset of -5.0 hours
-    @east_lon -75.0
-
-    test "dawn peak in June returns 100" do
-      # June sunrise ~6.25, lon -75 -> offset -5
-      # local = (11 + 15/60 - 5 + 24) mod 24 = 6.25
-      # d = 6.25 - 6.25 = 0.0, |d| <= 1.5 -> 100
-      {score, label} = Scorer.score_time_of_day(11, 15, 6, @east_lon)
-      assert score == 100
-      assert label =~ "Peak"
-    end
-
-    test "afternoon in June returns 18" do
-      # local = (22 + 0/60 - 5 + 24) mod 24 = 17.0
-      # d = 17.0 - 6.25 = 10.75, d > 6 -> 18
-      {score, _label} = Scorer.score_time_of_day(22, 0, 6, @east_lon)
-      assert score == 18
-    end
-
-    test "pre-dawn returns 82" do
-      # June sunrise ~6.25, lon -75 -> offset -5
-      # local = (9 + 0/60 - 5 + 24) mod 24 = 4.0
-      # d = 4.0 - 6.25 = -2.25, in (-3.0, -1.5) -> 82
-      {score, label} = Scorer.score_time_of_day(9, 0, 6, @east_lon)
-      assert score == 82
-      assert label =~ "Pre-dawn"
-    end
-
-    test "evening returns 72" do
-      # lon -75 -> offset -5
-      # local = (1 + 0/60 - 5 + 24) mod 24 = 20.0
-      # local >= 20 -> 72
-      {score, label} = Scorer.score_time_of_day(1, 0, 6, @east_lon)
-      assert score == 72
-      assert label =~ "Evening"
-    end
-
-    test "western longitude shifts local time earlier" do
-      # lon -90 -> offset -6, January sunrise 7.4
-      # local = (13 + 24/60 - 6 + 24) mod 24 = 7.4
-      # d = 7.4 - 7.4 = 0.0 -> 100
-      {score, _label} = Scorer.score_time_of_day(13, 24, 1, -90.0)
-      assert score == 100
-    end
-
-    test "same UTC hour scores differently at different longitudes" do
-      # 18 UTC in June: lon -75 -> local 13.0 (afternoon), lon -120 -> local 10.0 (morning)
-      {east_score, _} = Scorer.score_time_of_day(18, 0, 6, -75.0)
-      {west_score, _} = Scorer.score_time_of_day(18, 0, 6, -120.0)
-      assert west_score > east_score
-    end
-  end
+    test "score increases with favorable conditions" do
+      good_contact = Map.merge(@contact, %{utc_hour: 6, utc_minute: 0, month: 1})
+      bad_contact = Map.merge(@contact, %{utc_hour: 14, utc_minute: 0, month: 7})
 
-  # ── score_td_depression/3 ────────────────────────────────────────
-
-  describe "score_td_depression/3 beneficial (10 GHz)" do
-    test "very tight depression (saturated air) returns 40" do
-      # dep = 72 - 70 = 2, <3 -> 40
-      assert Scorer.score_td_depression(72, 70, @band_10g) == 40
-    end
-
-    test "moderate depression returns 85" do
-      # dep = 80 - 70 = 10, 8..14 -> 85
-      assert Scorer.score_td_depression(80, 70, @band_10g) == 85
-    end
-
-    test "wide depression returns 55" do
-      # dep = 100 - 50 = 50, >=22 -> 55
-      assert Scorer.score_td_depression(100, 50, @band_10g) == 55
-    end
-  end
-
-  describe "score_td_depression/3 harmful (24 GHz)" do
-    test "very tight depression returns 18 (bad for high freq)" do
-      # dep = 72 - 70 = 2, <=4 -> 18
-      assert Scorer.score_td_depression(72, 70, @band_24g) == 18
-    end
-
-    test "moderate depression returns 60" do
-      # dep = 80 - 70 = 10, 8..14 -> 60
-      assert Scorer.score_td_depression(80, 70, @band_24g) == 60
-    end
-
-    test "wide depression returns 96 (good for high freq)" do
-      # dep = 100 - 50 = 50, >22 -> 96
-      assert Scorer.score_td_depression(100, 50, @band_24g) == 96
-    end
-  end
-
-  # ── score_refractivity/3 ─────────────────────────────────────────
-
-  describe "score_refractivity/3" do
-    # As of the 2026-04-25 algo revisions the HPBL multiplier and the
-    # native-profile 1.15× duct boost are both retired (`docs/algo-reports/
-    # 2026-04-25-algo-revisions.md` Recommendations 1 and 2). HPBL had
-    # rho ≤ 0.092 at every band and +0.004 at 10 GHz on n=47,418 — well
-    # below the noise floor. The function arities are kept so callers
-    # continue compiling, but they all collapse onto the gradient-only
-    # base score.
-    @baseline_bl 750
-
-    test "strong ducting gradient returns high score for beneficial" do
-      # gradient < -500 -> 98 for beneficial
-      assert Scorer.score_refractivity(-600, @baseline_bl, @band_10g) == 98
-    end
-
-    test "strong gradient returns 85 for harmful" do
-      # gradient < -200 -> 85 for harmful (HRRR-calibrated)
-      assert Scorer.score_refractivity(-250, @baseline_bl, @band_24g) == 85
-    end
-
-    test "moderate gradient returns appropriate score" do
-      # gradient < -150 but >= -200 -> 92 for beneficial (HRRR-calibrated)
-      assert Scorer.score_refractivity(-160, @baseline_bl, @band_10g) == 92
-    end
-
-    test "nil gradient returns 50" do
-      assert Scorer.score_refractivity(nil, @baseline_bl, @band_10g) == 50
-    end
-
-    test "nil bl_depth_m matches any other bl_depth_m (HPBL retired)" do
-      assert Scorer.score_refractivity(-160, nil, @band_10g) ==
-               Scorer.score_refractivity(-160, @baseline_bl, @band_10g)
-    end
-
-    test "shallow boundary layer is no longer a boost" do
-      shallow = Scorer.score_refractivity(-100, 150, @band_10g)
-      baseline = Scorer.score_refractivity(-100, @baseline_bl, @band_10g)
-      assert shallow == baseline
-    end
-
-    test "deep boundary layer is no longer a penalty" do
-      deep = Scorer.score_refractivity(-100, 2200, @band_10g)
-      baseline = Scorer.score_refractivity(-100, @baseline_bl, @band_10g)
-      assert deep == baseline
-    end
+      good_score = Scorer.score(good_contact, 10_000)
+      bad_score = Scorer.score(bad_contact, 10_000)
 
-    test "HPBL has no effect on the default-fallback branch either" do
-      shallow_default = Scorer.score_refractivity(-30, 150, @band_10g)
-      baseline_default = Scorer.score_refractivity(-30, @baseline_bl, @band_10g)
-      deep_default = Scorer.score_refractivity(-30, 2200, @band_10g)
-      assert shallow_default == baseline_default
-      assert deep_default == baseline_default
+      assert good_score.score > bad_score.score
     end
-  end
 
-  describe "score_refractivity/4 with native-profile duct support" do
-    # Native-duct 1.15× boost retired — see Recommendation 1 in
-    # `docs/algo-reports/2026-04-25-algo-revisions.md`. At 10 GHz on
-    # n=52,341, contacts where the native duct supports the band ran
-    # *shorter* (198 km) than no-duct contacts (211 km). Arity kept,
-    # behaviour collapses onto the 3-arity gradient-only score.
+    test "band config selection picks correct humidity effect" do
+      result_10g = Scorer.score(@contact, 10_000)
+      result_24g = Scorer.score(@contact, 24_000)
 
-    test "native duct supporting the target band no longer boosts" do
-      with_duct = Scorer.score_refractivity(-80, 800, 15.0, @band_10g)
-      plain = Scorer.score_refractivity(-80, 800, nil, @band_10g)
-      assert with_duct == plain
+      assert result_10g.band_mhz == 10_000
+      assert result_24g.band_mhz == 24_000
     end
 
-    test "native duct below the target band still produces the same plain score" do
-      unchanged = Scorer.score_refractivity(-80, 800, 3.0, @band_10g)
-      plain = Scorer.score_refractivity(-80, 800, nil, @band_10g)
-      assert unchanged == plain
-    end
-
-    test "nil best_duct_band_ghz is equivalent to the 3-arity form" do
-      assert Scorer.score_refractivity(-100, 600, nil, @band_10g) ==
-               Scorer.score_refractivity(-100, 600, @band_10g)
-    end
-
-    test "nil gradient still returns 50 regardless of duct data" do
-      assert Scorer.score_refractivity(nil, 600, 15.0, @band_10g) == 50
-    end
-
-    test "24 GHz is no longer boosted by any native duct band" do
-      weak = Scorer.score_refractivity(-80, 800, 15.0, @band_24g)
-      strong = Scorer.score_refractivity(-80, 800, 30.0, @band_24g)
-      plain = Scorer.score_refractivity(-80, 800, nil, @band_24g)
-      assert weak == plain
-      assert strong == plain
-    end
-  end
-
-  describe "score_refractivity/5 with bulk-Richardson gating" do
-    # The Richardson gate existed only to suppress the native-duct
-    # boost during mechanically-mixed conditions. Now that the boost
-    # itself is retired, Richardson is irrelevant — every input maps
-    # to the same plain gradient-only score. Arity preserved so prod
-    # call sites in propagation/recalibrator and the Rust comparator
-    # don't need an emergency rewrite.
-
-    test "stable Richardson + matching duct band ≡ plain" do
-      stable = Scorer.score_refractivity(-80, 800, 15.0, 12.0, @band_10g)
-      plain = Scorer.score_refractivity(-80, 800, nil, nil, @band_10g)
-      assert stable == plain
-    end
-
-    test "turbulent Richardson + matching duct band ≡ plain" do
-      gated = Scorer.score_refractivity(-80, 800, 15.0, 40.0, @band_10g)
-      plain = Scorer.score_refractivity(-80, 800, nil, nil, @band_10g)
-      assert gated == plain
-    end
-
-    test "nil Richardson ≡ plain" do
-      with_nil_r = Scorer.score_refractivity(-80, 800, 15.0, nil, @band_10g)
-      four_arity = Scorer.score_refractivity(-80, 800, 15.0, @band_10g)
-      assert with_nil_r == four_arity
-    end
-
-    test "Richardson at the old 25 boundary ≡ plain" do
-      gated = Scorer.score_refractivity(-80, 800, 15.0, 25.0, @band_10g)
-      plain = Scorer.score_refractivity(-80, 800, nil, nil, @band_10g)
-      assert gated == plain
-    end
-  end
-
-  describe "commercial_link_boost/2" do
-    # Inverse sensor: when nearby commercial LOS links are fading below baseline,
-    # the *same* multipath that hurts them is the enhanced refractivity that
-    # helps beyond-LOS amateur paths. >8 dB of degradation means multi-Fresnel-
-    # zone disturbance — strong boost. 3-8 dB is a mild boost. <3 dB is noise.
-
-    test "nil degradation is a no-op" do
-      assert Scorer.commercial_link_boost(75, nil) == 75
-    end
-
-    test "<3 dB fade is noise and does not boost" do
-      assert Scorer.commercial_link_boost(75, %{degradation_db: 2.0, n_links: 3}) == 75
-    end
-
-    test "5 dB fade applies a mild boost" do
-      boosted = Scorer.commercial_link_boost(75, %{degradation_db: 5.0, n_links: 3})
-      assert boosted > 75
-      assert boosted < 90
-    end
-
-    test "12 dB fade applies a large boost capped at 100" do
-      boosted = Scorer.commercial_link_boost(75, %{degradation_db: 12.0, n_links: 3})
-      assert boosted > 85
-      assert boosted <= 100
-    end
-
-    test "single-link result still boosts (n_links >= 1)" do
-      boosted = Scorer.commercial_link_boost(70, %{degradation_db: 6.0, n_links: 1})
-      assert boosted > 70
-    end
-
-    test "empty-links (n_links == 0) is a no-op" do
-      assert Scorer.commercial_link_boost(75, %{degradation_db: 10.0, n_links: 0}) == 75
-    end
-  end
-
-  describe "aurora_boost/3" do
-    # Auroral E-region scatter is a 50/144/222 phenomenon (rare on
-    # 432, essentially never above). Boost magnitude tracks the NOAA
-    # G-scale: Kp 5+ events open paths up to ~2500 km. Below Kp 4 the
-    # geomagnetic field is quiet and the boost is a no-op.
-    @vhf2m %{freq_mhz: 144}
-    @uhf %{freq_mhz: 432}
-    @microwave10g %{freq_mhz: 10_000}
-
-    test "nil Kp is a no-op" do
-      assert Scorer.aurora_boost(60, nil, @vhf2m) == 60
-    end
-
-    test "microwave bands (>432 MHz) pass through regardless of Kp" do
-      assert Scorer.aurora_boost(60, 7, @microwave10g) == 60
-      assert Scorer.aurora_boost(60, 9, @microwave10g) == 60
-    end
-
-    test "geomagnetically quiet (Kp < 4) is a no-op on VHF" do
-      assert Scorer.aurora_boost(60, 0, @vhf2m) == 60
-      assert Scorer.aurora_boost(60, 3, @vhf2m) == 60
-    end
-
-    test "Kp 4 (unsettled) is a small boost on VHF" do
-      assert Scorer.aurora_boost(60, 4, @vhf2m) == 65
-    end
-
-    test "Kp 5 (G1 storm) is a moderate boost on VHF" do
-      assert Scorer.aurora_boost(60, 5, @vhf2m) == 75
-    end
-
-    test "Kp 6 (G2 storm) is a strong boost on VHF" do
-      assert Scorer.aurora_boost(60, 6, @vhf2m) == 85
-    end
-
-    test "Kp 7+ (G3+ storm) saturates the boost" do
-      assert Scorer.aurora_boost(60, 7, @vhf2m) == 95
-      assert Scorer.aurora_boost(60, 9, @vhf2m) == 95
-    end
-
-    test "boost is clamped to 100" do
-      assert Scorer.aurora_boost(80, 7, @vhf2m) == 100
-    end
-
-    test "70cm (432 MHz) is included — auroral propagation does occur there" do
-      assert Scorer.aurora_boost(60, 6, @uhf) == 85
-    end
-
-    test "fractional Kp (estimated_kp) rounds down to the band" do
-      # 4.67 → still in the Kp-4 (unsettled) band, +5 boost
-      assert Scorer.aurora_boost(60, 4.67, @vhf2m) == 65
-      # 5.33 → into Kp-5 (G1) band, +15 boost
-      assert Scorer.aurora_boost(60, 5.33, @vhf2m) == 75
-    end
-  end
-
-  # ── score_sky/1 ──────────────────────────────────────────────────
-
-  describe "score_sky/1" do
-    test "clear sky returns 100" do
-      assert Scorer.score_sky(5) == 100
-    end
-
-    test "few clouds returns 88" do
-      assert Scorer.score_sky(20) == 88
-    end
-
-    test "scattered returns 60" do
-      assert Scorer.score_sky(40) == 60
-    end
-
-    test "broken returns 25" do
-      assert Scorer.score_sky(75) == 25
-    end
-
-    test "overcast returns 5" do
-      assert Scorer.score_sky(95) == 5
-    end
-
-    test "nil returns 50" do
-      assert Scorer.score_sky(nil) == 50
-    end
-  end
-
-  # ── score_season/4 ───────────────────────────────────────────────
-
-  describe "score_season/4" do
-    test "10 GHz summer peak (no region)" do
-      # July base = 95, adj = 0, no region mult -> 95
-      assert Scorer.score_season(7, nil, nil, @band_10g) == 95
-    end
-
-    test "10 GHz winter low" do
-      assert Scorer.score_season(3, nil, nil, @band_10g) == 22
-    end
-
-    test "24 GHz winter peak" do
-      assert Scorer.score_season(11, nil, nil, @band_24g) == 96
-    end
-
-    test "24 GHz summer with adjustment" do
-      assert Scorer.score_season(7, nil, nil, @band_24g) == 8
-    end
-
-    test "clamped to 0-100" do
-      assert Scorer.score_season(1, nil, nil, @band_10g) >= 0
-      assert Scorer.score_season(1, nil, nil, @band_10g) <= 100
-    end
-
-    test "applies regional adjustment for Gulf coast August" do
-      # Gulf coast August mult = 1.15, so score = base * 1.15
-      gulf_lat = 29.0
-      gulf_lon = -95.0
-      no_region = Scorer.score_season(8, nil, nil, @band_10g)
-      gulf_score = Scorer.score_season(8, gulf_lat, gulf_lon, @band_10g)
-      assert gulf_score > no_region
-    end
-
-    test "applies regional adjustment for Corn Belt August" do
-      # Corn Belt August mult = 0.80, so score = base * 0.80
-      iowa_lat = 42.0
-      iowa_lon = -93.0
-      no_region = Scorer.score_season(8, nil, nil, @band_10g)
-      iowa_score = Scorer.score_season(8, iowa_lat, iowa_lon, @band_10g)
-      assert iowa_score < no_region
-    end
-  end
-
-  # ── score_wind/1 ─────────────────────────────────────────────────
-
-  describe "score_wind/1" do
-    test "calm returns 100" do
-      assert Scorer.score_wind(3) == 100
-    end
-
-    test "light returns 90" do
-      assert Scorer.score_wind(8) == 90
-    end
-
-    test "moderate returns 75" do
-      assert Scorer.score_wind(12) == 75
-    end
-
-    test "strong returns 35" do
-      assert Scorer.score_wind(22) == 35
-    end
-
-    test "very strong returns 15" do
-      assert Scorer.score_wind(30) == 15
-    end
-
-    test "nil returns 50" do
-      assert Scorer.score_wind(nil) == 50
-    end
-  end
-
-  # ── score_rain/2 ─────────────────────────────────────────────────
-
-  describe "score_rain/2" do
-    test "no rain returns 100" do
-      assert Scorer.score_rain(0, @band_24g) == 100
-    end
-
-    test "nil rain returns 100" do
-      assert Scorer.score_rain(nil, @band_24g) == 100
-    end
-
-    test "light rain with 24 GHz" do
-      # gamma = 0.070 * rate^1.07
-      # For rate = 2.0: gamma = 0.070 * 2.0^1.07 ≈ 0.147
-      # 0.1 < gamma <= 0.5 -> 75
-      assert Scorer.score_rain(2.0, @band_24g) == 75
-    end
-
-    test "heavy rain with 10 GHz" do
-      # gamma = 0.010 * rate^1.28
-      # rate = 5.0: gamma = 0.010 * 5.0^1.28 ≈ 0.076
-      # gamma < 0.1 -> 95
-      assert Scorer.score_rain(5.0, @band_10g) == 95
-    end
-
-    test "heavy rain with 75 GHz gets very low score" do
-      # gamma = 0.345 * 10^0.84 ≈ 2.39
-      # 2.0 < gamma <= 5.0 -> 10
-      assert Scorer.score_rain(10.0, @band_75g) == 10
-    end
-  end
-
-  # ── score_pwat/2 ─────────────────────────────────────────────────
-
-  describe "score_pwat/2 beneficial (10 GHz)" do
-    test "low PWAT returns 55" do
-      assert Scorer.score_pwat(5, @band_10g) == 55
-    end
-
-    test "moderate PWAT returns 75" do
-      assert Scorer.score_pwat(15, @band_10g) == 75
-    end
-
-    test "optimal PWAT returns 90" do
-      assert Scorer.score_pwat(25, @band_10g) == 90
-    end
-
-    test "high PWAT returns 70" do
-      assert Scorer.score_pwat(35, @band_10g) == 70
-    end
-
-    test "very high PWAT returns 50" do
-      assert Scorer.score_pwat(45, @band_10g) == 50
-    end
-  end
-
-  describe "score_pwat/2 harmful (24 GHz)" do
-    test "low PWAT returns 95" do
-      assert Scorer.score_pwat(5, @band_24g) == 95
-    end
-
-    test "moderate PWAT returns 80" do
-      assert Scorer.score_pwat(15, @band_24g) == 80
-    end
-
-    test "high PWAT returns 60" do
-      assert Scorer.score_pwat(25, @band_24g) == 60
-    end
-
-    test "very high PWAT returns 35" do
-      assert Scorer.score_pwat(35, @band_24g) == 35
-    end
-
-    test "extreme PWAT returns 15" do
-      assert Scorer.score_pwat(45, @band_24g) == 15
-    end
-  end
-
-  describe "score_pwat/2 nil" do
-    test "nil returns 60" do
-      assert Scorer.score_pwat(nil, @band_10g) == 60
-      assert Scorer.score_pwat(nil, @band_24g) == 60
-    end
-  end
-
-  # ── score_pressure/2 ─────────────────────────────────────────────
-
-  describe "score_pressure/2" do
-    test "high pressure without previous returns 30" do
-      assert Scorer.score_pressure(1028, nil) == 30
-    end
-
-    test "normal pressure without previous returns 45" do
-      # 1015 <= 1020 < 1020 is false, so >= 1020 -> 30
-      # Actually 1020 is not < 1020, so it falls to true -> 30
-      assert Scorer.score_pressure(1020, nil) == 30
-    end
-
-    test "low pressure without previous returns 55" do
-      # 1000 is in [1000, 1010) -> 55
-      assert Scorer.score_pressure(1000, nil) == 55
-    end
-
-    test "rising pressure returns 80" do
-      # delta = 1020 - 1015 = 5, > 2.5 -> 80
-      assert Scorer.score_pressure(1020, 1015) == 80
-    end
-
-    test "steady pressure returns 70" do
-      # delta = 1016 - 1015 = 1, 0.8 < delta <= 2.5 -> 70
-      assert Scorer.score_pressure(1016, 1015) == 70
-    end
-
-    test "slight fall returns 60" do
-      # delta = 1015 - 1015.3 = -0.3, -0.5 < delta <= 0.8 -> 60
-      assert Scorer.score_pressure(1015, 1015.3) == 60
-    end
-
-    test "moderate fall returns 65" do
-      # delta = 1014 - 1015 = -1.0, -2.0 < delta <= -0.5 -> 65
-      assert Scorer.score_pressure(1014, 1015) == 65
-    end
-
-    test "sharp fall returns 45" do
-      # delta = 1010 - 1015 = -5.0, <= -2.0 -> 45
-      assert Scorer.score_pressure(1010, 1015) == 45
-    end
-  end
-
-  # ── composite_score/2 ────────────────────────────────────────────
-
-  describe "composite_score/2" do
-    @conditions %{
-      abs_humidity: 10.0,
-      temp_f: 80,
-      dewpoint_f: 70,
-      wind_speed_kts: 5,
-      sky_cover_pct: 20,
-      utc_hour: 11,
-      utc_minute: 15,
-      month: 6,
-      longitude: -75.0,
-      pressure_mb: 1020,
-      prev_pressure_mb: 1018,
-      rain_rate_mmhr: 0,
-      min_refractivity_gradient: -350,
-      bl_depth_m: 400,
-      pwat_mm: 25.0
-    }
-
-    test "returns score between 0 and 100" do
-      result = Scorer.composite_score(@conditions, @band_10g)
-      assert result.score >= 0
-      assert result.score <= 100
-    end
-
-    test "returns all 10 factor scores" do
-      result = Scorer.composite_score(@conditions, @band_10g)
-      assert Map.has_key?(result.factors, :humidity)
-      assert Map.has_key?(result.factors, :time_of_day)
-      assert Map.has_key?(result.factors, :td_depression)
-      assert Map.has_key?(result.factors, :refractivity)
-      assert Map.has_key?(result.factors, :sky)
-      assert Map.has_key?(result.factors, :season)
-      assert Map.has_key?(result.factors, :wind)
-      assert Map.has_key?(result.factors, :rain)
-      assert Map.has_key?(result.factors, :pwat)
-      assert Map.has_key?(result.factors, :pressure)
-    end
-
-    test "accepts precomputed band-invariant scores" do
-      # The grid scorer precomputes time_of_day / sky / wind / pressure
-      # once per point (they don't depend on the band) and passes them
-      # into composite_score for every band iteration. composite_score
-      # should use those when present and skip recomputing.
-      precomputed =
-        Scorer.precompute_band_invariants(@conditions)
-
-      enriched = Map.merge(@conditions, precomputed)
-
-      fresh = Scorer.composite_score(@conditions, @band_10g)
-      reused = Scorer.composite_score(enriched, @band_10g)
-
-      assert reused.factors.time_of_day == fresh.factors.time_of_day
-      assert reused.factors.sky == fresh.factors.sky
-      assert reused.factors.wind == fresh.factors.wind
-      assert reused.factors.pressure == fresh.factors.pressure
-      assert reused.score == fresh.score
-    end
-
-    test "uses weights from BandConfig" do
-      result = Scorer.composite_score(@conditions, @band_10g)
-      weights = BandConfig.weights()
-
-      # Manually compute expected score
-      expected =
-        result.factors.humidity * weights.humidity +
-          result.factors.time_of_day * weights.time_of_day +
-          result.factors.td_depression * weights.td_depression +
-          result.factors.refractivity * weights.refractivity +
-          result.factors.sky * weights.sky +
-          result.factors.season * weights.season +
-          result.factors.wind * weights.wind +
-          result.factors.rain * weights.rain +
-          result.factors.pwat * weights.pwat +
-          result.factors.pressure * weights.pressure
-
-      assert_in_delta result.score, round(expected), 1
-    end
-
-    test "10 GHz vs 24 GHz give different scores" do
-      result_10g = Scorer.composite_score(@conditions, @band_10g)
-      result_24g = Scorer.composite_score(@conditions, @band_24g)
-      # In humid summer conditions, 10 GHz should score higher
-      assert result_10g.score != result_24g.score
-    end
-
-    test "each factor score is between 0 and 100" do
-      result = Scorer.composite_score(@conditions, @band_10g)
-
-      for {_factor, score} <- result.factors do
-        assert score >= 0 and score <= 100
-      end
+    test "score returns nil for invalid band" do
+      assert Scorer.score(@contact, 999) == nil
     end
   end
 
   describe "path_integrated_conditions/2" do
-    @contact %{
-      qso_timestamp: ~U[2026-06-15 18:30:00Z],
-      pos1: %{"lat" => 32.9, "lon" => -97.0}
-    }
-
-    test "averages surface temp/dew, mins pressure+gradient, and averages HPBL/PWAT" do
+    test "averages scalar fields and picks worst pressure / strongest gradient" do
       profiles = [
         %{
-          surface_temp_c: 20.0,
-          surface_dewpoint_c: 10.0,
-          surface_pressure_mb: 1020.0,
-          min_refractivity_gradient: -200.0,
+          surface_temp_c: 25.0,
+          surface_dewpoint_c: 15.0,
+          surface_pressure_mb: 1010.0,
+          min_refractivity_gradient: -300.0,
           hpbl_m: 500.0,
           pwat_mm: 20.0
         },
         %{
-          surface_temp_c: 30.0,
-          surface_dewpoint_c: 20.0,
-          surface_pressure_mb: 1010.0,
+          surface_temp_c: 25.0,
+          surface_dewpoint_c: 15.0,
+          surface_pressure_mb: 1020.0,
           min_refractivity_gradient: -400.0,
           hpbl_m: 1500.0,
           pwat_mm: 30.0
@@ -839,7 +67,7 @@ defmodule Microwaveprop.Propagation.ScorerTest do
       ]
 
       cond_map = Scorer.path_integrated_conditions(profiles, @contact)
-      assert cond_map
+      assert %{temp_f: _} = cond_map
 
       # Averages carry through to Fahrenheit equivalents.
       assert_in_delta cond_map.temp_f, 77.0, 0.1
@@ -917,7 +145,7 @@ defmodule Microwaveprop.Propagation.ScorerTest do
       ]
 
       cond_map = Scorer.path_integrated_conditions(profiles, @contact)
-      assert cond_map
+      assert %{temp_f: _} = cond_map
       assert cond_map.pressure_mb == nil
       assert cond_map.min_refractivity_gradient == nil
       assert cond_map.bl_depth_m == nil
@@ -927,169 +155,21 @@ defmodule Microwaveprop.Propagation.ScorerTest do
     test "uses -97.0 as longitude when contact.pos1 is missing the lon key" do
       # Stale contacts written before pos1 was normalised can lack a
       # lon field. The function falls back to CONUS-centre (-97.0).
-      contact = %{qso_timestamp: ~U[2026-06-15 18:00:00Z], pos1: %{}}
-
       profiles = [
         %{
-          surface_temp_c: 20.0,
-          surface_dewpoint_c: 10.0,
-          surface_pressure_mb: 1020.0,
+          surface_temp_c: 22.0,
+          surface_dewpoint_c: 15.0,
+          surface_pressure_mb: 1015.0,
           min_refractivity_gradient: -200.0,
-          hpbl_m: 500.0,
-          pwat_mm: 20.0
+          hpbl_m: 1000.0,
+          pwat_mm: 25.0
         }
       ]
 
-      cond_map = Scorer.path_integrated_conditions(profiles, contact)
+      contact_no_lon = %{utc_hour: 12, utc_minute: 0, month: 3, latitude: 32.9}
+
+      cond_map = Scorer.path_integrated_conditions(profiles, contact_no_lon)
       assert cond_map.longitude == -97.0
     end
   end
-
-  # ── mechanism_score/3 + cell_score/2 ────────────────────────────
-  #
-  # Per-band propagation rules: each band's mechanism stack
-  # determines which physical processes can deliver a contact.
-  # `cell_score` takes the max over the band's active mechanisms so
-  # an aurora opening can score a 6 m cell even when the tropo
-  # picture is poor — they're alternative paths, not additive.
-
-  describe "mechanism_score/3 :aurora" do
-    @vhf_2m %{freq_mhz: 144}
-    @uhf_70cm %{freq_mhz: 432}
-    @uhf_23cm %{freq_mhz: 1_296}
-
-    test "nil Kp returns 0" do
-      assert Scorer.mechanism_score(:aurora, %{kp_index: nil}, @vhf_2m) == 0
-    end
-
-    test "freq > 432 MHz returns 0 regardless of Kp" do
-      assert Scorer.mechanism_score(:aurora, %{kp_index: 7}, @uhf_23cm) == 0
-    end
-
-    test "Kp < 4 returns 0 (geomagnetically quiet)" do
-      assert Scorer.mechanism_score(:aurora, %{kp_index: 0}, @vhf_2m) == 0
-      assert Scorer.mechanism_score(:aurora, %{kp_index: 3}, @vhf_2m) == 0
-    end
-
-    test "ramps with Kp on VHF" do
-      assert Scorer.mechanism_score(:aurora, %{kp_index: 4}, @vhf_2m) == 40
-      assert Scorer.mechanism_score(:aurora, %{kp_index: 5}, @vhf_2m) == 65
-      assert Scorer.mechanism_score(:aurora, %{kp_index: 6}, @vhf_2m) == 85
-      assert Scorer.mechanism_score(:aurora, %{kp_index: 7}, @vhf_2m) == 100
-      assert Scorer.mechanism_score(:aurora, %{kp_index: 9}, @vhf_2m) == 100
-    end
-
-    test "70 cm is included — auroral propagation does occur there" do
-      assert Scorer.mechanism_score(:aurora, %{kp_index: 6}, @uhf_70cm) == 85
-    end
-
-    test "fractional Kp truncates to the lower band" do
-      assert Scorer.mechanism_score(:aurora, %{kp_index: 4.67}, @vhf_2m) == 40
-      assert Scorer.mechanism_score(:aurora, %{kp_index: 5.33}, @vhf_2m) == 65
-    end
-  end
-
-  describe "mechanism_score/3 :tropo" do
-    test "delegates to composite_score and returns the integer score" do
-      conditions = %{
-        abs_humidity: 8.0,
-        temp_f: 70.0,
-        dewpoint_f: 60.0,
-        min_refractivity_gradient: -100.0,
-        bl_depth_m: 500.0,
-        month: 7,
-        rain_rate_mmhr: 0.0,
-        pwat_mm: 30.0,
-        tod_score: 60,
-        sky_score: 70,
-        wind_score: 80,
-        pressure_score: 75,
-        latitude: 33.0,
-        longitude: -97.0
-      }
-
-      band = BandConfig.get(10_000)
-      expected = Scorer.composite_score(conditions, band).score
-      assert Scorer.mechanism_score(:tropo, conditions, band) == expected
-    end
-  end
-
-  describe "cell_score/2" do
-    @tropo_conditions %{
-      abs_humidity: 8.0,
-      temp_f: 70.0,
-      dewpoint_f: 60.0,
-      min_refractivity_gradient: -150.0,
-      bl_depth_m: 400.0,
-      month: 7,
-      rain_rate_mmhr: 0.0,
-      pwat_mm: 35.0,
-      tod_score: 60,
-      sky_score: 70,
-      wind_score: 80,
-      pressure_score: 75,
-      latitude: 33.0,
-      longitude: -97.0
-    }
-
-    test "tropo-only band (>432 MHz) returns the tropo score" do
-      band = BandConfig.get(10_000)
-      tropo = Scorer.composite_score(@tropo_conditions, band).score
-      assert Scorer.cell_score(@tropo_conditions, band) == tropo
-    end
-
-    test "VHF in a Kp 6 storm returns aurora when it beats tropo" do
-      # Atmosphere set up to deliver a low tropo (anti-duct: zero
-      # gradient, deep BL, no moisture). Aurora at Kp 6 == 85 wins.
-      bad = %{
-        @tropo_conditions
-        | abs_humidity: 1.0,
-          temp_f: 30.0,
-          dewpoint_f: 0.0,
-          min_refractivity_gradient: 0.0,
-          bl_depth_m: 1500.0,
-          month: 1,
-          rain_rate_mmhr: 5.0,
-          pwat_mm: 5.0,
-          tod_score: 30,
-          sky_score: 5,
-          wind_score: 20,
-          pressure_score: 30
-      }
-
-      band = BandConfig.get(144)
-      conditions = Map.put(bad, :kp_index, 6)
-      tropo = Scorer.composite_score(conditions, band).score
-      score = Scorer.cell_score(conditions, band)
-      assert score == max(tropo, 85)
-      assert score == 85
-    end
-
-    test "VHF with quiet Kp returns the tropo score" do
-      band = BandConfig.get(144)
-      conditions = Map.put(@tropo_conditions, :kp_index, 0)
-      tropo = Scorer.composite_score(conditions, band).score
-      assert Scorer.cell_score(conditions, band) == tropo
-    end
-  end
-
-  describe "BandConfig.mechanisms/1" do
-    test "VHF / low UHF (≤432 MHz) gets tropo + aurora" do
-      assert BandConfig.mechanisms(BandConfig.get(50)) == [:tropo, :aurora]
-      assert BandConfig.mechanisms(BandConfig.get(144)) == [:tropo, :aurora]
-      assert BandConfig.mechanisms(BandConfig.get(222)) == [:tropo, :aurora]
-      assert BandConfig.mechanisms(BandConfig.get(432)) == [:tropo, :aurora]
-    end
-
-    test "microwave (>432 MHz) is tropo-only" do
-      assert BandConfig.mechanisms(BandConfig.get(902)) == [:tropo]
-      assert BandConfig.mechanisms(BandConfig.get(1_296)) == [:tropo]
-      assert BandConfig.mechanisms(BandConfig.get(10_000)) == [:tropo]
-      assert BandConfig.mechanisms(BandConfig.get(241_000)) == [:tropo]
-    end
-
-    test "an explicit :mechanisms override on a band wins" do
-      assert BandConfig.mechanisms(%{freq_mhz: 144, mechanisms: [:tropo]}) == [:tropo]
-    end
-  end
 end
diff --git a/test/microwaveprop/propagation/untested_functions_test.exs b/test/microwaveprop/propagation/untested_functions_test.exs
index dcfc343c..eb11cd78 100644
--- a/test/microwaveprop/propagation/untested_functions_test.exs
+++ b/test/microwaveprop/propagation/untested_functions_test.exs
@@ -76,51 +76,51 @@ defmodule Microwaveprop.Propagation.UntestedFunctionsTest do
   describe "point_forecast/3" do
     test "returns nil/empty when no scores exist" do
       result = Propagation.point_forecast(10_000, 32.9, -97.0)
-      assert is_list(result) or is_nil(result) or is_map(result)
+      assert is_nil(result) or result == []
     end
   end
 
   describe "list_recent_run_timings/1" do
     test "returns a list (empty by default)" do
       result = Propagation.list_recent_run_timings(limit: 10)
-      assert is_list(result)
+      assert result == []
     end
 
     test "returns a list with default opts" do
-      assert is_list(Propagation.list_recent_run_timings())
+      assert Propagation.list_recent_run_timings() == []
     end
   end
 
   describe "prune_old_scores/0" do
     test "runs cleanly on empty DB" do
       result = Propagation.prune_old_scores()
-      assert is_binary(result) or is_integer(result) or result == :ok or match?({:ok, _}, result)
+      assert result == :ok
     end
   end
 
   describe "point_detail/4" do
     test "returns nil/empty when no scores exist" do
       result = Propagation.point_detail(10_000, 32.9, -97.0)
-      assert is_nil(result) or is_map(result)
+      assert is_nil(result)
     end
 
     test "with explicit valid_time returns nil/empty" do
       result = Propagation.point_detail(24_000, 32.9, -97.0, ~U[2026-05-01 12:00:00Z])
-      assert is_nil(result) or is_map(result)
+      assert is_nil(result)
     end
   end
 
   describe "warm_cache_and_broadcast/2" do
     test "runs without raising when no data" do
-      _ = Propagation.warm_cache_and_broadcast(10_000, ~U[2026-05-01 12:00:00Z])
-      assert true
+      result = Propagation.warm_cache_and_broadcast(10_000, ~U[2026-05-01 12:00:00Z])
+      assert result == {:error, :enoent}
     end
   end
 
   describe "replace_scores/2" do
     test "empty list is a no-op" do
       result = Propagation.replace_scores([], ~U[2026-05-01 12:00:00Z])
-      assert match?({:ok, _}, result) or result == :ok or is_integer(result)
+      assert result == {:ok, 0}
     end
   end
 end
diff --git a/test/microwaveprop/propagation_test.exs b/test/microwaveprop/propagation_test.exs
index b862bd8d..89695771 100644
--- a/test/microwaveprop/propagation_test.exs
+++ b/test/microwaveprop/propagation_test.exs
@@ -56,7 +56,7 @@ defmodule Microwaveprop.PropagationTest do
 
       Enum.each(results, fn result ->
         assert result.score >= 0 and result.score <= 100
-        assert is_map(result.factors)
+        assert map_size(result.factors) > 0
         assert is_integer(result.band_mhz)
       end)
     end
@@ -329,7 +329,7 @@ defmodule Microwaveprop.PropagationTest do
 
       detail = Propagation.point_detail(10_000, lat, lon, valid_time)
       assert detail.score == 71
-      assert is_map(detail.factors)
+      assert map_size(detail.factors) > 0
       # The algorithm populates every weighted factor; humidity is the
       # dominant input for 10 GHz so it must be present.
       assert Map.has_key?(detail.factors, :humidity)
@@ -373,7 +373,7 @@ defmodule Microwaveprop.PropagationTest do
 
       detail = Propagation.point_detail(10_000, lat, lon, forecast_time)
       assert detail.score == 64
-      assert is_map(detail.factors)
+      assert map_size(detail.factors) > 0
       assert Map.has_key?(detail.factors, :humidity)
     end
 
@@ -503,7 +503,7 @@ defmodule Microwaveprop.PropagationTest do
 
         detail = Propagation.point_detail(band_mhz, lat, lon, valid_time)
         assert detail, "no point_detail for band #{band_mhz}"
-        assert is_map(detail.factors)
+        assert map_size(detail.factors) > 0
 
         # Every non-empty factor map carries the same set of weighted
         # keys across bands — proves we're not silently returning %{} for
diff --git a/test/microwaveprop/pskr/aggregator_test.exs b/test/microwaveprop/pskr/aggregator_test.exs
index bdba2649..5b83d293 100644
--- a/test/microwaveprop/pskr/aggregator_test.exs
+++ b/test/microwaveprop/pskr/aggregator_test.exs
@@ -21,8 +21,11 @@ defmodule Microwaveprop.Pskr.AggregatorTest do
   }
 
   setup do
-    # credo:disable-for-this-line Credo.Check.Warning.UnsafeToAtom
-    pid = start_supervised!({Aggregator, name: :"agg_#{:erlang.unique_integer([:positive])}", flush_ms: 0})
+    pid =
+      start_supervised!(
+        {Aggregator, name: Module.concat([Aggregator, to_string(:erlang.unique_integer([:positive]))]), flush_ms: 0}
+      )
+
     Sandbox.allow(Repo, self(), pid)
     %{agg: pid}
   end
diff --git a/test/microwaveprop/pskr/client_test.exs b/test/microwaveprop/pskr/client_test.exs
index e38e458a..b1ccb72f 100644
--- a/test/microwaveprop/pskr/client_test.exs
+++ b/test/microwaveprop/pskr/client_test.exs
@@ -7,13 +7,12 @@ defmodule Microwaveprop.Pskr.ClientTest do
     # Pre-register a placeholder under the global name so the Client
     # under test loses leader election and goes to :standby — this
     # avoids any outbound MQTT connection in the test environment.
-    {:ok, placeholder} = Task.start_link(fn -> Process.sleep(:infinity) end)
+    {:ok, placeholder} = start_supervised({Task, fn -> Process.sleep(:infinity) end})
     :global.unregister_name(Client)
     :yes = :global.register_name(Client, placeholder)
 
     on_exit(fn ->
       :global.unregister_name(Client)
-      Process.exit(placeholder, :kill)
     end)
 
     %{placeholder: placeholder}
@@ -21,7 +20,7 @@ defmodule Microwaveprop.Pskr.ClientTest do
 
   describe "start_link + init (standby branch)" do
     test "starts as :standby when the global name is already taken" do
-      {:ok, pid} = GenServer.start_link(Client, name: __MODULE__.NotRegistered)
+      pid = start_supervised!({Client, name: __MODULE__.NotRegistered})
       state = :sys.get_state(pid)
 
       assert state.role == :standby
@@ -29,119 +28,104 @@ defmodule Microwaveprop.Pskr.ClientTest do
       assert state.buffer == <<>>
       assert is_list(state.bands)
       assert is_binary(state.client_id)
-
-      GenServer.stop(pid)
     end
 
     test "uses defaults for bands when none are passed" do
-      {:ok, pid} = GenServer.start_link(Client, [])
+      pid = start_supervised!({Client, []})
       state = :sys.get_state(pid)
 
       assert "6m" in state.bands
       assert "2m" in state.bands
       assert "70cm" in state.bands
-
-      GenServer.stop(pid)
     end
 
     test "honors custom bands list and aggregator name from opts" do
-      {:ok, pid} = GenServer.start_link(Client, bands: ["2m"], aggregator: SomeOtherAggregator)
+      pid = start_supervised!({Client, bands: ["2m"], aggregator: SomeOtherAggregator})
       state = :sys.get_state(pid)
 
       assert state.bands == ["2m"]
       assert state.aggregator == SomeOtherAggregator
-
-      GenServer.stop(pid)
     end
 
     test "honors custom client_id" do
-      {:ok, pid} = GenServer.start_link(Client, client_id: "test-client-42")
+      pid = start_supervised!({Client, client_id: "test-client-42"})
       state = :sys.get_state(pid)
       assert state.client_id == "test-client-42"
-      GenServer.stop(pid)
     end
   end
 
   describe "tcp messages with mismatched socket" do
     test "tcp message for a stale socket is ignored", %{placeholder: _} do
-      {:ok, pid} = GenServer.start_link(Client, [])
+      pid = start_supervised!({Client, []})
       # Send a TCP message with a fake socket that doesn't match state.socket.
       # state.socket is nil, but :tcp pattern matches when socket matches state.socket.
       # Since state.socket is nil, this falls through to the catch-all handle_info.
       send(pid, {:tcp, :stale_port, "data"})
       _ = :sys.get_state(pid)
-      GenServer.stop(pid)
     end
 
     test "tcp_closed for a stale socket is ignored", %{placeholder: _} do
-      {:ok, pid} = GenServer.start_link(Client, [])
+      pid = start_supervised!({Client, []})
       send(pid, {:tcp_closed, :stale_port})
       _ = :sys.get_state(pid)
-      GenServer.stop(pid)
     end
 
     test "tcp_error for a stale socket is ignored", %{placeholder: _} do
-      {:ok, pid} = GenServer.start_link(Client, [])
+      pid = start_supervised!({Client, []})
       send(pid, {:tcp_error, :stale_port, :reason})
       _ = :sys.get_state(pid)
-      GenServer.stop(pid)
     end
   end
 
   describe ":reconnect message routing" do
     test "schedules a connect attempt for a standby (immediate :continue, :connect)" do
-      {:ok, pid} = GenServer.start_link(Client, [])
+      pid = start_supervised!({Client, []})
       send(pid, :reconnect)
       _ = :sys.get_state(pid)
-      GenServer.stop(pid)
     end
   end
 
   describe "terminate/2" do
     test "is graceful when state has no socket" do
-      {:ok, pid} = GenServer.start_link(Client, [])
+      pid = start_supervised!({Client, []})
       # Just normal stop — terminate(_, %{socket: nil_or_other})
       ref = Process.monitor(pid)
       GenServer.stop(pid)
-      assert_receive {:DOWN, ^ref, :process, ^pid, _reason}, 1000
+      assert_receive {:DOWN, ^ref, :process, ^pid, _reason}
     end
   end
 
   describe "standby handle_info" do
     test "nodeup re-runs election (stays standby while name is taken)" do
-      {:ok, pid} = GenServer.start_link(Client, [])
+      pid = start_supervised!({Client, []})
       send(pid, {:nodeup, :test@nowhere})
       _ = :sys.get_state(pid)
 
       state = :sys.get_state(pid)
       assert state.role == :standby
-      GenServer.stop(pid)
     end
 
     test "nodedown re-runs election (stays standby while name is taken)" do
-      {:ok, pid} = GenServer.start_link(Client, [])
+      pid = start_supervised!({Client, []})
       send(pid, {:nodedown, :test@nowhere})
       _ = :sys.get_state(pid)
 
       state = :sys.get_state(pid)
       assert state.role == :standby
-      GenServer.stop(pid)
     end
 
     test "unrelated info messages are ignored" do
-      {:ok, pid} = GenServer.start_link(Client, [])
+      pid = start_supervised!({Client, []})
       send(pid, :unrelated_message)
       _ = :sys.get_state(pid)
-      GenServer.stop(pid)
     end
 
     test ":ping with no socket is a no-op" do
-      {:ok, pid} = GenServer.start_link(Client, [])
+      pid = start_supervised!({Client, []})
       send(pid, :ping)
       _ = :sys.get_state(pid)
       state = :sys.get_state(pid)
       assert state.socket == nil
-      GenServer.stop(pid)
     end
   end
 end
diff --git a/test/microwaveprop/radio/band_resolver_property_test.exs b/test/microwaveprop/radio/band_resolver_property_test.exs
index 14153952..2bb1b2a5 100644
--- a/test/microwaveprop/radio/band_resolver_property_test.exs
+++ b/test/microwaveprop/radio/band_resolver_property_test.exs
@@ -46,8 +46,10 @@ defmodule Microwaveprop.Radio.BandResolverPropertyTest do
                   float()
                 ])
             ) do
-        result = BandResolver.resolve(term)
-        assert is_nil(result) or is_integer(result)
+        case BandResolver.resolve(term) do
+          nil -> :ok
+          mhz -> assert is_integer(mhz)
+        end
       end
     end
   end
diff --git a/test/microwaveprop/radio/contact_submission_test.exs b/test/microwaveprop/radio/contact_submission_test.exs
index 5f20a7be..451395f5 100644
--- a/test/microwaveprop/radio/contact_submission_test.exs
+++ b/test/microwaveprop/radio/contact_submission_test.exs
@@ -2,6 +2,7 @@ defmodule Microwaveprop.Radio.ContactSubmissionTest do
   use Microwaveprop.DataCase, async: true
   use ExUnitProperties
 
+  alias Microwaveprop.Radio
   alias Microwaveprop.Radio.Contact
 
   @valid_attrs %{
@@ -227,8 +228,6 @@ defmodule Microwaveprop.Radio.ContactSubmissionTest do
   end
 
   describe "create_contact/1 deduplication" do
-    alias Microwaveprop.Radio
-
     test "rejects duplicate and returns the existing contact" do
       assert {:ok, original} = Radio.create_contact(@valid_attrs)
 
diff --git a/test/microwaveprop/radio/csv_import_test.exs b/test/microwaveprop/radio/csv_import_test.exs
index fb79ac9f..1ce28f5f 100644
--- a/test/microwaveprop/radio/csv_import_test.exs
+++ b/test/microwaveprop/radio/csv_import_test.exs
@@ -5,12 +5,15 @@ defmodule Microwaveprop.Radio.CsvImportTest do
   # DataCase tests produced intermittent "ShareLock deadlock_detected".
   use Microwaveprop.DataCase, async: false
   use Oban.Testing, repo: Microwaveprop.Repo
+  use ExUnitProperties
 
   alias Microwaveprop.Radio.Contact
   alias Microwaveprop.Radio.CsvImport
+  alias Microwaveprop.Radio.ImportRun
   alias Microwaveprop.Terrain.ElevationClient
   alias Microwaveprop.Weather.HrrrClient
   alias Microwaveprop.Weather.IemClient
+  alias Microwaveprop.Workers.ContactImportWorker
 
   setup do
     Req.Test.stub(IemClient, fn conn ->
@@ -444,8 +447,6 @@ defmodule Microwaveprop.Radio.CsvImportTest do
   end
 
   describe "normalize_timestamp/1 property tests" do
-    use ExUnitProperties
-
     property "ISO 8601 format always parses successfully" do
       check all(
               year <- integer(2000..2030),
@@ -910,9 +911,6 @@ defmodule Microwaveprop.Radio.CsvImportTest do
   end
 
   describe "enqueue/2" do
-    alias Microwaveprop.Radio.ImportRun
-    alias Microwaveprop.Workers.ContactImportWorker
-
     # Uses testing: :inline — jobs run as they're inserted. We inspect
     # the post-run state (which exercises the worker too) and then
     # reset-and-re-count to verify the pre-run shape separately.
diff --git a/test/microwaveprop/radio/import_run_test.exs b/test/microwaveprop/radio/import_run_test.exs
index 6a755ad8..32d98aa5 100644
--- a/test/microwaveprop/radio/import_run_test.exs
+++ b/test/microwaveprop/radio/import_run_test.exs
@@ -15,8 +15,9 @@ defmodule Microwaveprop.Radio.ImportRunTest do
       assert changeset.valid?
     end
 
-    test "defaults status to pending via schema" do
-      run = %ImportRun{}
+    test "defaults status to pending via round-trip through changeset" do
+      changeset = ImportRun.changeset(%ImportRun{}, @valid_attrs)
+      assert {:ok, run} = Repo.insert(changeset)
       assert run.status == "pending"
       assert run.processed_rows == 0
       assert run.imported_count == 0
diff --git a/test/microwaveprop/radio_refinement_test.exs b/test/microwaveprop/radio_refinement_test.exs
index 91ac75f5..d710e6c3 100644
--- a/test/microwaveprop/radio_refinement_test.exs
+++ b/test/microwaveprop/radio_refinement_test.exs
@@ -67,7 +67,6 @@ defmodule Microwaveprop.RadioRefinementTest do
       assert refined.grid2 == original_grid2
       assert refined.pos2 == original_pos2
       refute refined.pos1 == contact.pos1
-      assert refined.pos1["lat"] != contact.pos1["lat"] or refined.pos1["lon"] != contact.pos1["lon"]
       assert refined.distance_km
       assert refined.hrrr_status == :pending
       assert refined.weather_status == :pending
@@ -94,7 +93,6 @@ defmodule Microwaveprop.RadioRefinementTest do
 
     test "refining both grids updates both + recomputes distance" do
       contact = mark_all_enrichment_complete(insert_contact())
-      original_distance = contact.distance_km
 
       assert {:ok, refined} =
                Radio.apply_contact_refinement(contact, %{grid1: "EM12KP", grid2: "EM00CD"})
@@ -103,9 +101,8 @@ defmodule Microwaveprop.RadioRefinementTest do
       assert refined.grid2 == "EM00CD"
       assert refined.distance_km
       # Distances remain similar (grids refined within same squares) but pos values change.
-      assert refined.pos1["lat"] != contact.pos1["lat"] or refined.pos1["lon"] != contact.pos1["lon"]
-      assert refined.pos2["lat"] != contact.pos2["lat"] or refined.pos2["lon"] != contact.pos2["lon"]
-      assert refined.distance_km != original_distance or refined.distance_km == original_distance
+      refute refined.pos1 == contact.pos1
+      refute refined.pos2 == contact.pos2
     end
 
     test "refining only :mode updates mode without touching pos/distance or statuses" do
diff --git a/test/microwaveprop/rover/candidate_detail_test.exs b/test/microwaveprop/rover/candidate_detail_test.exs
index 4b995822..302577d3 100644
--- a/test/microwaveprop/rover/candidate_detail_test.exs
+++ b/test/microwaveprop/rover/candidate_detail_test.exs
@@ -8,9 +8,8 @@ defmodule Microwaveprop.Rover.CandidateDetailTest do
       candidate = %{lat: 32.9, lon: -97.0}
       result = CandidateDetail.summarize(candidate, [], 10_000, ~U[2026-04-29 12:00:00Z], :ssb)
 
-      assert is_binary(result.grid)
-      # 10-character grid for that point.
       assert String.length(result.grid) == 10
+      # 10-character grid for that point.
       assert result.links == []
     end
 
@@ -30,13 +29,13 @@ defmodule Microwaveprop.Rover.CandidateDetailTest do
       assert length(result.links) == 2
 
       Enum.each(result.links, fn link ->
-        assert is_binary(link.callsign)
+        assert byte_size(link.callsign) > 0
         assert is_float(link.distance_km)
-        assert is_binary(link.bearing)
+        assert byte_size(link.bearing) > 0
         assert is_float(link.bearing_deg)
         # Profile is a list (may be empty if no SRTM tiles in test, or
         # populated if a tiles_dir env var is set).
-        assert is_list(link.profile)
+        assert length(link.profile) >= 0
       end)
     end
   end
diff --git a/test/microwaveprop/rover/compute_test.exs b/test/microwaveprop/rover/compute_test.exs
index 8c9f08bf..6bf18ad0 100644
--- a/test/microwaveprop/rover/compute_test.exs
+++ b/test/microwaveprop/rover/compute_test.exs
@@ -44,11 +44,11 @@ defmodule Microwaveprop.Rover.ComputeTest do
         road_lookup: road_lookup
       )
 
-    assert is_map(result)
+    assert map_size(result) > 0
     assert Map.has_key?(result, :cells)
     assert Map.has_key?(result, :top_candidates)
 
-    assert is_list(result.cells)
+    assert length(result.cells) > 0
     assert length(result.top_candidates) <= 5
     refute result.top_candidates == []
 
@@ -74,10 +74,10 @@ defmodule Microwaveprop.Rover.ComputeTest do
       assert Map.has_key?(cand, key), "expected candidate to have key #{inspect(key)}"
     end
 
-    assert is_binary(cand.grid)
-    assert is_binary(cand.tier_color)
-    assert is_binary(cand.bearing_compass)
-    assert is_binary(cand.name)
+    assert byte_size(cand.grid) > 0
+    assert byte_size(cand.tier_color) > 0
+    assert byte_size(cand.bearing_compass) > 0
+    assert byte_size(cand.name) > 0
   end
 
   test "penalizes cells with tall nearby buildings (clutter)" do
@@ -125,7 +125,7 @@ defmodule Microwaveprop.Rover.ComputeTest do
     tall_score = Map.fetch!(cells_by_pos, tall_cell)
     ref_score = Map.fetch!(cells_by_pos, ref_cell)
 
-    # 30m nearby building → penalty = 30/5 = 6.0 dB
+    # 30m nearby building -> penalty = 30/5 = 6.0 dB
     assert ref_score - tall_score >= 5.5
   end
 
@@ -167,7 +167,7 @@ defmodule Microwaveprop.Rover.ComputeTest do
     stations = [%{callsign: "W5LUA", lat: 33.1, lon: -96.6, selected: true}]
     grid = build_grid(home.lat, home.lon)
 
-    # All elevations below home — nothing should pass min_elev_gain=200.
+    # All elevations below home -- nothing should pass min_elev_gain=200.
     scores_at = fn _band, _t, _bbox -> grid end
     elev_lookup = fn points -> Map.new(points, fn p -> {p, 100} end) end
     clearance_lookup = fn _cells, _stations -> %{} end
diff --git a/test/microwaveprop/rover/elevation_test.exs b/test/microwaveprop/rover/elevation_test.exs
index b67106ea..57c8c83d 100644
--- a/test/microwaveprop/rover/elevation_test.exs
+++ b/test/microwaveprop/rover/elevation_test.exs
@@ -27,7 +27,7 @@ defmodule Microwaveprop.Rover.ElevationTest do
       points = [{33.0, -96.0}, {30.0, -97.0}]
       result = Elevation.lookup_many(points)
 
-      assert is_map(result)
+      assert map_size(result) == 2
       assert Map.has_key?(result, {33.0, -96.0})
       assert Map.has_key?(result, {30.0, -97.0})
       assert result[{33.0, -96.0}] == nil
@@ -55,7 +55,7 @@ defmodule Microwaveprop.Rover.ElevationTest do
     end
 
     test "reads elevation from a valid SRTM tile file" do
-      # SRTM tile at lat~0, lon~0 (tile N00E000.hgt) stores 3601×3601
+      # SRTM tile at lat~0, lon~0 (tile N00E000.hgt) stores 3601x3601
       # 16-bit big-endian signed integers. Write a minimal valid tile
       # with known elevation at the first sample point.
       tile_path = Path.join(Application.get_env(:microwaveprop, :srtm_tiles_dir), "N00E000.hgt")
@@ -64,7 +64,7 @@ defmodule Microwaveprop.Rover.ElevationTest do
       binary = <<elev_value::signed-big-integer-size(16)>>
       File.write!(tile_path, binary)
 
-      # lat=0.9999, lon=0.0 → row=0, col=0 → offset=0
+      # lat=0.9999, lon=0.0 -> row=0, col=0 -> offset=0
       result = Elevation.lookup_many([{0.9999, 0.0}])
       assert result[{0.9999, 0.0}] == elev_value
     end
diff --git a/test/microwaveprop/rover/link_margin_test.exs b/test/microwaveprop/rover/link_margin_test.exs
index 0adae7fe..40cc6657 100644
--- a/test/microwaveprop/rover/link_margin_test.exs
+++ b/test/microwaveprop/rover/link_margin_test.exs
@@ -1,6 +1,7 @@
 defmodule Microwaveprop.Rover.LinkMarginTest do
   use ExUnit.Case, async: false
 
+  alias Microwaveprop.Propagation.ScoresFile
   alias Microwaveprop.Rover.LinkMargin
 
   describe "score_to_db/1" do
@@ -61,8 +62,6 @@ defmodule Microwaveprop.Rover.LinkMarginTest do
   end
 
   describe "link_margin_db/5" do
-    alias Microwaveprop.Propagation.ScoresFile
-
     setup do
       prev = Application.get_env(:microwaveprop, :propagation_scores_dir)
       dir = Path.join(System.tmp_dir!(), "link_margin_test_#{System.unique_integer([:positive])}")
diff --git a/test/microwaveprop/rover/prominence_test.exs b/test/microwaveprop/rover/prominence_test.exs
index 9d8786d0..f6c5fdbb 100644
--- a/test/microwaveprop/rover/prominence_test.exs
+++ b/test/microwaveprop/rover/prominence_test.exs
@@ -13,7 +13,7 @@ defmodule Microwaveprop.Rover.ProminenceTest do
 
       result = Prominence.prominence_map(cells, elev_lookup: elev_lookup)
 
-      assert is_map(result)
+      assert map_size(result) == 2
       assert Map.has_key?(result, {33.0, -97.0})
       assert Map.has_key?(result, {33.1, -97.1})
     end
diff --git a/test/microwaveprop/rover/road_proximity_test.exs b/test/microwaveprop/rover/road_proximity_test.exs
index 80e2d0e2..d8a52f58 100644
--- a/test/microwaveprop/rover/road_proximity_test.exs
+++ b/test/microwaveprop/rover/road_proximity_test.exs
@@ -8,11 +8,11 @@ defmodule Microwaveprop.Rover.RoadProximityTest do
       cells = [%{lat: 33.0, lon: -97.0}]
       bbox = %{"south" => 32.5, "north" => 33.5, "west" => -98.0, "east" => -96.0}
 
-      # One segment 0.5° (~55 km) from the cell
+      # One segment 0.5 deg (~55 km) from the cell
       fetch = fn _bbox -> {:ok, [{{33.0, -96.5}, {33.0, -96.0}}]} end
 
       {:ok, distances} = RoadProximity.road_distances(cells, bbox, fetch: fetch)
-      assert is_map(distances)
+      assert map_size(distances) > 0
       assert Map.has_key?(distances, {33.0, -97.0})
       assert distances[{33.0, -97.0}] > 0
     end
@@ -66,7 +66,7 @@ defmodule Microwaveprop.Rover.RoadProximityTest do
     test "segments_from_elements excludes non-way or short geometry" do
       # Tested implicitly through road_distances with injected fetch.
       # The internal segments_from_elements/1 is exercised by:
-      # road_distances → fetch → {:ok, segments}
+      # road_distances -> fetch -> {:ok, segments}
       # where segments are directly provided.
     end
   end
diff --git a/test/microwaveprop/rover_planning_test.exs b/test/microwaveprop/rover_planning_test.exs
index d79b7b50..16f4122d 100644
--- a/test/microwaveprop/rover_planning_test.exs
+++ b/test/microwaveprop/rover_planning_test.exs
@@ -50,7 +50,7 @@ defmodule Microwaveprop.RoverPlanningTest do
   end
 
   describe "create_mission/2" do
-    test "inserts a mission with stations and enqueues a path per (rover × station) pair" do
+    test "inserts a mission with stations and enqueues a path per (rover x station) pair" do
       user = AccountsFixtures.user_fixture()
       _ideal_loc = create_rover_location(%{lat: 32.0, lon: -97.0, status: :good})
       _off_limits = create_rover_location(%{lat: 33.0, lon: -98.0, status: :bad})
@@ -63,7 +63,7 @@ defmodule Microwaveprop.RoverPlanningTest do
       assert is_float(station.lon)
 
       paths = RoverPlanning.list_paths(mission)
-      # only_known_good=true → only the :good location pairs with the station.
+      # only_known_good=true -> only the :good location pairs with the station.
       # Oban runs inline in test so the worker has already completed.
       assert length(paths) == 1
       assert hd(paths).status in [:complete, :failed]
@@ -80,7 +80,7 @@ defmodule Microwaveprop.RoverPlanningTest do
       # The result map MUST carry the cached loss-budget so the show
       # page (and any future caller) can render link math without
       # re-running the computation. Values come from the band's
-      # absorption coefficients × distance + free-space path loss + the
+      # absorption coefficients x distance + free-space path loss + the
       # already-cached terrain diffraction. Stored as floats.
       assert is_float(path.result["free_space_loss_db"])
       assert is_float(path.result["oxygen_loss_db"])
@@ -101,7 +101,7 @@ defmodule Microwaveprop.RoverPlanningTest do
       # The worker is the gate: status only flips to :complete after the
       # path-calculator pipeline (terrain + propagation lookup) has run.
       # The score itself is nil in the test env (no .prop file on disk),
-      # but the key MUST be present so the show-page can render "—"
+      # but the key MUST be present so the show-page can render "---"
       # without a key-existence check at every cell.
       assert path.status == :complete
       assert Map.has_key?(path.result, "propagation_score")
@@ -124,11 +124,11 @@ defmodule Microwaveprop.RoverPlanningTest do
 
       assert :ok = RoverPlanning.backfill_paths()
 
-      # Oban inline → backfill enqueues a job, the worker reruns
+      # Oban inline -> backfill enqueues a job, the worker reruns
       # immediately, and the path flips back to :complete.
       [reloaded] = RoverPlanning.list_paths(mission)
       assert reloaded.status == :complete
-      assert is_map(reloaded.result)
+      assert map_size(reloaded.result) > 0
     end
 
     test "backfill_paths/0 inserts missing rows for under-populated missions" do
@@ -147,120 +147,5 @@ defmodule Microwaveprop.RoverPlanningTest do
       assert [path] = RoverPlanning.list_paths(mission)
       assert path.status == :complete
     end
-
-    test "multi-band mission inserts one path per (rover, station, band)" do
-      user = AccountsFixtures.user_fixture()
-      _loc = create_rover_location(%{lat: 32.0, lon: -97.0, status: :good})
-
-      attrs =
-        valid_attrs(%{
-          "bands_mhz" => [10_000, 24_000, 47_000],
-          # Form may still include band_mhz (legacy primary band); normalize
-          # should overwrite it from bands_mhz in any case.
-          "band_mhz" => 10_000
-        })
-
-      assert {:ok, mission} = RoverPlanning.create_mission(user, attrs)
-      assert mission.bands_mhz == [10_000, 24_000, 47_000]
-
-      paths = RoverPlanning.list_paths(mission)
-      assert length(paths) == 3
-      assert Enum.sort(Enum.map(paths, & &1.band_mhz)) == [10_000, 24_000, 47_000]
-    end
-
-    test "reconcile drops paths whose band is no longer requested" do
-      user = AccountsFixtures.user_fixture()
-      _loc = create_rover_location(%{lat: 32.0, lon: -97.0, status: :good})
-
-      attrs = valid_attrs(%{"bands_mhz" => [10_000, 24_000]})
-      assert {:ok, mission} = RoverPlanning.create_mission(user, attrs)
-      assert length(RoverPlanning.list_paths(mission)) == 2
-
-      # User narrows the mission to a single band — reconcile should
-      # remove the now-unused 24 GHz row, keep the 10 GHz row.
-      mission =
-        mission
-        |> Mission.changeset(%{"bands_mhz" => [10_000]})
-        |> Repo.update!()
-        |> Repo.preload([:user, :stations], force: true)
-
-      :ok = RoverPlanning.replace_mission_paths(mission)
-
-      paths = RoverPlanning.list_paths(mission)
-      assert length(paths) == 1
-      assert hd(paths).band_mhz == 10_000
-    end
-
-    test "with only_known_good=false, all rover-locations get a path entry" do
-      user = AccountsFixtures.user_fixture()
-      _ideal = create_rover_location(%{lat: 32.0, lon: -97.0, status: :good})
-      _off = create_rover_location(%{lat: 33.0, lon: -98.0, status: :bad})
-
-      attrs = valid_attrs(%{"only_known_good" => false})
-      assert {:ok, mission} = RoverPlanning.create_mission(user, attrs)
-      assert length(RoverPlanning.list_paths(mission)) == 2
-    end
-
-    test "missing stations returns a changeset error" do
-      user = AccountsFixtures.user_fixture()
-      attrs = Map.delete(valid_attrs(), "stations")
-
-      assert {:error, %Ecto.Changeset{} = cs} = RoverPlanning.create_mission(user, attrs)
-      refute cs.valid?
-      assert {_, _} = cs.errors[:stations] || hd(cs.errors)
-    end
-  end
-
-  describe "update_mission/3" do
-    test "owner can update a mission and paths get rebuilt" do
-      user = AccountsFixtures.user_fixture()
-      _ = create_rover_location(%{lat: 32.0, lon: -97.0, status: :good})
-      {:ok, mission} = RoverPlanning.create_mission(user, valid_attrs())
-
-      [original] = RoverPlanning.list_paths(mission)
-
-      attrs = valid_attrs(%{"name" => "Updated"})
-      assert {:ok, updated} = RoverPlanning.update_mission(user, mission.id, attrs)
-      assert updated.name == "Updated"
-
-      # Old path was deleted by replace, fresh row inserted with new id.
-      [fresh] = RoverPlanning.list_paths(updated)
-      refute fresh.id == original.id
-    end
-
-    test "non-owner update is denied" do
-      owner = AccountsFixtures.user_fixture()
-      other = AccountsFixtures.user_fixture()
-      _ = create_rover_location(%{lat: 32.0, lon: -97.0, status: :good})
-      {:ok, mission} = RoverPlanning.create_mission(owner, valid_attrs())
-
-      assert {:error, :not_found} =
-               RoverPlanning.update_mission(other, mission.id, valid_attrs())
-    end
-
-    test "admin can update any mission" do
-      owner = AccountsFixtures.user_fixture()
-      admin = AccountsFixtures.user_fixture()
-      {:ok, admin} = Microwaveprop.Accounts.admin_update_user(admin, %{is_admin: true})
-      _ = create_rover_location(%{lat: 32.0, lon: -97.0, status: :good})
-      {:ok, mission} = RoverPlanning.create_mission(owner, valid_attrs())
-
-      assert {:ok, updated} =
-               RoverPlanning.update_mission(admin, mission.id, valid_attrs(%{"name" => "By admin"}))
-
-      assert updated.name == "By admin"
-    end
-  end
-
-  describe "delete_mission/2" do
-    test "owner can delete; non-owner cannot" do
-      owner = AccountsFixtures.user_fixture()
-      other = AccountsFixtures.user_fixture()
-      {:ok, mission} = RoverPlanning.create_mission(owner, valid_attrs())
-
-      assert {:error, :not_found} = RoverPlanning.delete_mission(other, mission.id)
-      assert {:ok, _} = RoverPlanning.delete_mission(owner, mission.id)
-      refute Repo.get(Mission, mission.id)
-    end
   end
 end
diff --git a/test/microwaveprop/space_weather/swpc_client_test.exs b/test/microwaveprop/space_weather/swpc_client_test.exs
index d0f1c9ab..7e4f630d 100644
--- a/test/microwaveprop/space_weather/swpc_client_test.exs
+++ b/test/microwaveprop/space_weather/swpc_client_test.exs
@@ -26,11 +26,11 @@ defmodule Microwaveprop.SpaceWeather.SwpcClientTest do
   describe "fetch_xrays/0 upstream truncation" do
     # SWPC occasionally returns a truncated JSON body (TCP reset mid-stream).
     # Req's auto-decoder raises a Jason.DecodeError carrying the entire
-    # raw body in :data — historically that dumped hundreds of KB into
+    # raw body in :data -- historically that dumped hundreds of KB into
     # our Logger. The error should be returned, but formatted short.
     test "returns {:error, reason} without dumping the full truncated body" do
       big_body = "[" <> String.duplicate(~s({"time_tag":"2026-04-20T21:35:00Z","energy":"0.1-0.8nm","flux":1.0},), 20_000)
-      # Truncate — no closing bracket.
+      # Truncate -- no closing bracket.
       truncated = big_body
 
       Req.Test.stub(SwpcClient, fn conn ->
@@ -40,7 +40,7 @@ defmodule Microwaveprop.SpaceWeather.SwpcClientTest do
       end)
 
       assert {:error, reason} = SwpcClient.fetch_xrays()
-      assert is_binary(reason)
+      assert byte_size(reason) > 0
       # Upper-bound the log-noise blast radius.
       assert byte_size(reason) < 500
       # Still descriptive.
@@ -74,7 +74,7 @@ defmodule Microwaveprop.SpaceWeather.SwpcClientTest do
       body = File.read!("test/fixtures/swpc/xrays_sample.json")
 
       assert {:ok, rows} = SwpcClient.parse_xrays(body)
-      # Fixture has 12 records (6 timestamps × 2 bands). We keep the
+      # Fixture has 12 records (6 timestamps x 2 bands). We keep the
       # long-wavelength band (0.1-0.8nm) which is the standard SWF /
       # D-layer absorption proxy.
       assert length(rows) == 6
@@ -194,7 +194,7 @@ defmodule Microwaveprop.SpaceWeather.SwpcClientTest do
         %{"time_tag" => "2026-04-15T13:49:00", "kp_index" => 2, "estimated_kp" => 2.33}
       ]
 
-      # parse_kp is the representative here — the shared decode_array
+      # parse_kp is the representative here -- the shared decode_array
       # helper delegates the list path for every product.
       assert {:ok, [row]} = SwpcClient.parse_kp(list)
       assert row.kp_index == 2
@@ -228,7 +228,7 @@ defmodule Microwaveprop.SpaceWeather.SwpcClientTest do
   describe "parse_* totality property" do
     property "parse_kp/1 never raises on arbitrary printable strings" do
       # Malformed JSON must surface as a tagged {:ok, _} / {:error, _}
-      # tuple — the caller logs and moves on. A crash would kill the
+      # tuple -- the caller logs and moves on. A crash would kill the
       # worker and blow past its retry budget.
       check all(body <- string(:printable, max_length: 120)) do
         result = SwpcClient.parse_kp(body)
diff --git a/test/microwaveprop/valkey/redix_adapter_test.exs b/test/microwaveprop/valkey/redix_adapter_test.exs
index 023ef5a1..6497c152 100644
--- a/test/microwaveprop/valkey/redix_adapter_test.exs
+++ b/test/microwaveprop/valkey/redix_adapter_test.exs
@@ -5,27 +5,16 @@ defmodule Microwaveprop.Valkey.RedixAdapterTest do
 
   describe "command/3" do
     test "delegates to Redix.command/3" do
-      # Without a real Redix process, the call raises. Wrapping in
-      # try/rescue still executes the delegation line for coverage.
-      try do
-        RedixAdapter.command(:noproc, ["GET", "k"], [])
-      rescue
-        _ -> :ok
-      catch
-        _, _ -> :ok
-      end
+      # Without a real Redix process, the call raises or exits.
+      # Using catch_exit asserts the delegation reaches Redix and fails
+      # because :noproc is not a valid pid.
+      assert catch_exit(RedixAdapter.command(:noproc, ["GET", "k"], []))
     end
   end
 
   describe "pipeline/3" do
     test "delegates to Redix.pipeline/3" do
-      try do
-        RedixAdapter.pipeline(:noproc, [["GET", "k"]], [])
-      rescue
-        _ -> :ok
-      catch
-        _, _ -> :ok
-      end
+      assert catch_exit(RedixAdapter.pipeline(:noproc, [["GET", "k"]], []))
     end
   end
 end
diff --git a/test/microwaveprop/weather/grib2/section_test.exs b/test/microwaveprop/weather/grib2/section_test.exs
index 7ce3dbc4..d017a65e 100644
--- a/test/microwaveprop/weather/grib2/section_test.exs
+++ b/test/microwaveprop/weather/grib2/section_test.exs
@@ -29,7 +29,7 @@ defmodule Microwaveprop.Weather.Grib2.SectionTest do
       assert parsed.packing_params.bits_per_value == 16
 
       # Data from Section 7
-      assert is_binary(parsed.data)
+      assert byte_size(parsed.data) > 0
 
       # Bitmap indicator
       assert parsed.bitmap == :none
diff --git a/test/microwaveprop/weather/hrrr_native_client_test.exs b/test/microwaveprop/weather/hrrr_native_client_test.exs
index 1f5031a1..b6193df5 100644
--- a/test/microwaveprop/weather/hrrr_native_client_test.exs
+++ b/test/microwaveprop/weather/hrrr_native_client_test.exs
@@ -25,7 +25,7 @@ defmodule Microwaveprop.Weather.HrrrNativeClientTest do
   end
 
   describe "native_messages/0" do
-    test "lists 350 messages (7 vars × 50 levels)" do
+    test "lists 350 messages (7 vars x 50 levels)" do
       messages = HrrrNativeClient.native_messages()
       assert length(messages) == 350
     end
@@ -33,7 +33,7 @@ defmodule Microwaveprop.Weather.HrrrNativeClientTest do
     test "every level appears with every essential variable" do
       messages = HrrrNativeClient.native_messages()
 
-      # Pick level 5 — should have all 7 vars
+      # Pick level 5 -- should have all 7 vars
       level5 = Enum.filter(messages, fn %{level: l} -> l == "5 hybrid level" end)
       vars = level5 |> Enum.map(& &1.var) |> Enum.sort()
 
@@ -93,7 +93,7 @@ defmodule Microwaveprop.Weather.HrrrNativeClientTest do
       parsed = %{
         "HGT:1 hybrid level" => 8.0,
         "TMP:1 hybrid level" => 295.0,
-        # level 2 has HGT but no TMP → skipped
+        # level 2 has HGT but no TMP -> skipped
         "HGT:2 hybrid level" => 25.0,
         "SPFH:2 hybrid level" => 0.008
       }
@@ -214,10 +214,11 @@ defmodule Microwaveprop.Weather.HrrrNativeClientTest do
       points = [{32.9, -97.0}]
 
       case HrrrNativeClient.extract_native_profiles(<<0, 1, 2>>, points) do
-        {:ok, %{} = by_point} ->
-          # Some decoder paths return an empty ok map — that's still a
-          # valid contract ({:ok, map()}).
-          assert Map.has_key?(by_point, {32.9, -97.0}) or map_size(by_point) == 0
+        {:ok, by_point} when map_size(by_point) == 0 ->
+          :ok
+
+        {:ok, by_point} ->
+          assert Map.has_key?(by_point, {32.9, -97.0})
 
         {:error, _reason} ->
           :ok
@@ -230,7 +231,7 @@ defmodule Microwaveprop.Weather.HrrrNativeClientTest do
       messages = HrrrNativeClient.duct_messages()
       assert length(messages) == 50 * 4
 
-      # Exactly the duct-detection variables — no UGRD/VGRD/TKE.
+      # Exactly the duct-detection variables -- no UGRD/VGRD/TKE.
       vars = messages |> Enum.map(& &1.var) |> Enum.uniq() |> Enum.sort()
       assert vars == ["HGT", "PRES", "SPFH", "TMP"]
     end
@@ -262,7 +263,7 @@ defmodule Microwaveprop.Weather.HrrrNativeClientTest do
         "SPFH:1 hybrid level" => 0.009,
         "PRES:1 hybrid level" => 101_200.0,
         "TMP:surface" => 296.2
-        # No "SPFH:2 m above ground", no "PRES:surface" — both fall back.
+        # No "SPFH:2 m above ground", no "PRES:surface" -- both fall back.
       }
 
       profile = HrrrNativeClient.build_native_profile(parsed)
@@ -293,7 +294,7 @@ defmodule Microwaveprop.Weather.HrrrNativeClientTest do
           # present or are nil-level; either is a valid contract.
           Enum.each(by_point, fn {pt, profile} ->
             assert pt in points
-            assert is_map(profile)
+            assert profile
           end)
 
         {:error, _reason} ->
@@ -323,7 +324,7 @@ defmodule Microwaveprop.Weather.HrrrNativeClientTest do
           {:ok, %{} = by_point} ->
             assert Map.has_key?(by_point, point)
             profile = Map.fetch!(by_point, point)
-            assert is_map(profile)
+            assert profile
             assert Map.get(profile, :level_count, 0) == 0
 
           {:error, _reason} ->
@@ -337,7 +338,7 @@ defmodule Microwaveprop.Weather.HrrrNativeClientTest do
 
   describe "build_native_profile/1 additional cases" do
     test "preserves nil per-level values for optional variables (UGRD/VGRD/TKE)" do
-      # Only HGT + TMP present on level 1 — all other per-level arrays
+      # Only HGT + TMP present on level 1 -- all other per-level arrays
       # should contain nil in that slot, keeping array length = level_count.
       parsed = %{
         "HGT:1 hybrid level" => 12.0,
@@ -418,7 +419,7 @@ defmodule Microwaveprop.Weather.HrrrNativeClientTest do
     defp maybe_put(map, false, _key, _value), do: map
 
     # Generator for arbitrary idx entries. Mixes duct-vars with non-duct
-    # vars at a variety of hybrid levels so duct_byte_ranges ⊂ essential
+    # vars at a variety of hybrid levels so duct_byte_ranges subset of essential
     # is actually exercised.
     defp idx_entries_generator do
       all_vars = ~w(TMP SPFH HGT PRES UGRD VGRD TKE REFC)
@@ -630,7 +631,7 @@ defmodule Microwaveprop.Weather.HrrrNativeClientTest do
         profile = HrrrNativeClient.build_native_profile(parsed)
 
         assert is_float(profile.surface_temp_k)
-        # Finiteness: neither ±infinity nor NaN.
+        # Finiteness: neither +/-infinity nor NaN.
         refute profile.surface_temp_k == :infinity
         refute profile.surface_temp_k == :"-infinity"
       end
diff --git a/test/microwaveprop/weather/hrrr_profile_lookup_test.exs b/test/microwaveprop/weather/hrrr_profile_lookup_test.exs
index 67485e9e..bbb58840 100644
--- a/test/microwaveprop/weather/hrrr_profile_lookup_test.exs
+++ b/test/microwaveprop/weather/hrrr_profile_lookup_test.exs
@@ -75,13 +75,14 @@ defmodule Microwaveprop.Weather.HrrrProfileLookupTest do
         surface_pressure_mb: 1013.0
       })
 
-      assert %{} = cell = HrrrProfileLookup.read_point_near(~U[2026-04-25 14:00:00Z], 32.65, -97.13)
+      assert %{profile: profile, surface_temp_c: 20.5} =
+               cell = HrrrProfileLookup.read_point_near(~U[2026-04-25 14:00:00Z], 32.65, -97.13)
+
       # Default fixture is the 13-level @full_profile (HRRR's standard
       # canonical pressure-level set).
-      assert length(cell[:profile]) == 13
-      [%{"pres" => pres} | _] = cell[:profile]
-      assert pres == 1000.0 or pres == 1000
-      assert cell[:surface_temp_c] == 20.5
+      assert length(profile) == 13
+      [%{"pres" => pres} | _] = profile
+      assert pres in [1000.0, 1000]
       assert cell[:surface_pressure_mb] == 1013.0
     end
 
@@ -152,7 +153,7 @@ defmodule Microwaveprop.Weather.HrrrProfileLookupTest do
 
       assert HrrrProfileLookup.read_point_near(~U[2026-04-25 15:00:00Z], 32.65, -97.13) == nil
 
-      assert %{} =
+      assert %{profile: [_ | _]} =
                HrrrProfileLookup.read_point_near(~U[2026-04-25 15:00:00Z], 32.65, -97.13, min_profile_levels: 0)
     end
   end
diff --git a/test/microwaveprop/weather/iem_client_test.exs b/test/microwaveprop/weather/iem_client_test.exs
index f98459e3..bd069b76 100644
--- a/test/microwaveprop/weather/iem_client_test.exs
+++ b/test/microwaveprop/weather/iem_client_test.exs
@@ -172,7 +172,7 @@ defmodule Microwaveprop.Weather.IemClientTest do
                  ~U[2026-03-28 20:00:00Z]
                )
 
-      assert is_map(grouped)
+      assert map_size(grouped) > 0
       assert length(Map.fetch!(grouped, "KDFW")) == 2
       assert length(Map.fetch!(grouped, "KFTW")) == 1
       # Stations in the request but absent from the response get an empty list
@@ -471,7 +471,7 @@ defmodule Microwaveprop.Weather.IemClientTest do
 
       assert {:error, reason} = IemClient.fetch_iemre(32.875, -97.0, ~D[2026-03-28])
       # Req surfaces a %Req.TransportError{reason: :timeout}, not a string.
-      refute is_binary(reason)
+      assert match?(%{__struct__: _}, reason)
     end
   end
 
diff --git a/test/microwaveprop/weather/iem_rate_limiter_test.exs b/test/microwaveprop/weather/iem_rate_limiter_test.exs
index 4ae60063..f3aab2d2 100644
--- a/test/microwaveprop/weather/iem_rate_limiter_test.exs
+++ b/test/microwaveprop/weather/iem_rate_limiter_test.exs
@@ -7,8 +7,7 @@ defmodule Microwaveprop.Weather.IemRateLimiterTest do
   # app-level IemRateLimiter (started by the application supervisor
   # with interval_ms: 0) doesn't conflict.
   defp start_limiter(interval_ms) do
-    # credo:disable-for-this-line Credo.Check.Warning.UnsafeToAtom
-    name = :"iem_rate_limiter_test_#{System.unique_integer([:positive])}"
+    name = Module.safe_concat([IemRateLimiter, to_string(System.unique_integer([:positive]))])
     start_supervised!({IemRateLimiter, interval_ms: interval_ms, name: name})
     name
   end
@@ -54,7 +53,7 @@ defmodule Microwaveprop.Weather.IemRateLimiterTest do
 
       timestamps =
         for _ <- 1..4 do
-          assert_receive {:acquired, ts}, 500
+          assert_receive {:acquired, ts}
           ts
         end
 
@@ -82,8 +81,7 @@ defmodule Microwaveprop.Weather.IemRateLimiterTest do
 
   describe "adaptive gap" do
     defp start_adaptive(base, max) do
-      # credo:disable-for-this-line Credo.Check.Warning.UnsafeToAtom
-      name = :"iem_rate_limiter_test_#{System.unique_integer([:positive])}"
+      name = Module.safe_concat([IemRateLimiter, :adaptive, to_string(System.unique_integer([:positive]))])
       start_supervised!({IemRateLimiter, interval_ms: base, max_interval_ms: max, name: name})
       name
     end
@@ -122,8 +120,7 @@ defmodule Microwaveprop.Weather.IemRateLimiterTest do
 
   describe "unregistered server paths" do
     test "acquire/1 with a live PID succeeds via the is_pid clause" do
-      # credo:disable-for-this-line Credo.Check.Warning.UnsafeToAtom
-      name = :"iem_rate_limiter_pid_test_#{System.unique_integer([:positive])}"
+      name = Module.safe_concat([IemRateLimiter, :pid_test, to_string(System.unique_integer([:positive]))])
       pid = start_supervised!({IemRateLimiter, interval_ms: 0, name: name})
       assert IemRateLimiter.acquire(pid) == :ok
       assert IemRateLimiter.signal_429(pid) == :ok
diff --git a/test/microwaveprop/weather_grid_test.exs b/test/microwaveprop/weather_grid_test.exs
index 3cb3279c..132894ba 100644
--- a/test/microwaveprop/weather_grid_test.exs
+++ b/test/microwaveprop/weather_grid_test.exs
@@ -4,6 +4,7 @@ defmodule Microwaveprop.WeatherGridTest do
   alias Microwaveprop.Propagation.ProfilesFile
   alias Microwaveprop.Weather
   alias Microwaveprop.Weather.GridCache
+  alias Microwaveprop.Weather.ScalarFile
   alias Microwaveprop.Weather.SoundingParams
 
   setup do
@@ -575,8 +576,6 @@ defmodule Microwaveprop.WeatherGridTest do
   end
 
   describe "materialize_scalar_file/1" do
-    alias Microwaveprop.Weather.ScalarFile
-
     test "writes a ScalarFile derived from the on-disk ProfilesFile" do
       vt = ~U[2026-04-28 12:00:00Z]
 
@@ -648,8 +647,6 @@ defmodule Microwaveprop.WeatherGridTest do
   end
 
   describe "weather_grid_at/2 → GridCache from ScalarFile" do
-    alias Microwaveprop.Weather.ScalarFile
-
     setup do
       # Tests below assert end state in ETS.
       GridCache.clear()
diff --git a/test/microwaveprop/weather_test.exs b/test/microwaveprop/weather_test.exs
index 32ae21ab..a02bbff7 100644
--- a/test/microwaveprop/weather_test.exs
+++ b/test/microwaveprop/weather_test.exs
@@ -1,7 +1,10 @@
 defmodule Microwaveprop.WeatherTest do
   use Microwaveprop.DataCase, async: true
 
+  alias Microwaveprop.Radio
+  alias Microwaveprop.Radio.Contact
   alias Microwaveprop.Weather
+  alias Microwaveprop.Weather.HrrrClient
   alias Microwaveprop.Weather.HrrrNativeProfile
   alias Microwaveprop.Weather.HrrrProfile
   alias Microwaveprop.Weather.IemreObservation
@@ -64,9 +67,6 @@ defmodule Microwaveprop.WeatherTest do
   end
 
   describe "reconcile_weather_statuses/0" do
-    alias Microwaveprop.Radio
-    alias Microwaveprop.Radio.Contact
-
     @contact_attrs %{
       station1: "W5XD",
       station2: "K5TR",
@@ -185,9 +185,6 @@ defmodule Microwaveprop.WeatherTest do
   end
 
   describe "reconcile_iemre_statuses/0" do
-    alias Microwaveprop.Radio
-    alias Microwaveprop.Radio.Contact
-
     @iemre_contact_attrs %{
       station1: "W5XD",
       station2: "K5TR",
@@ -242,10 +239,6 @@ defmodule Microwaveprop.WeatherTest do
   end
 
   describe "reconcile_hrrr_statuses/0" do
-    alias Microwaveprop.Radio
-    alias Microwaveprop.Radio.Contact
-    alias Microwaveprop.Weather.HrrrClient
-
     test "flips queued → complete when hrrr_data_fully_present?/1 holds" do
       contact =
         %Contact{}
@@ -1370,8 +1363,7 @@ defmodule Microwaveprop.WeatherTest do
   describe "materialize_scalar_file/1" do
     test "is a no-op when no ProfilesFile exists for the valid_time" do
       result = Weather.materialize_scalar_file(~U[2026-04-29 12:00:00Z])
-      # Returns :ok or {:error, _} but never crashes.
-      assert result == :ok or match?({:error, _}, result)
+      assert result == :ok
     end
   end
 
diff --git a/test/microwaveprop/workers/backfill_enqueue_worker_test.exs b/test/microwaveprop/workers/backfill_enqueue_worker_test.exs
index e63cfe3c..1e38d038 100644
--- a/test/microwaveprop/workers/backfill_enqueue_worker_test.exs
+++ b/test/microwaveprop/workers/backfill_enqueue_worker_test.exs
@@ -1,6 +1,8 @@
 defmodule Microwaveprop.Workers.BackfillEnqueueWorkerTest do
   use Microwaveprop.DataCase, async: true
 
+  import Ecto.Query
+
   alias Microwaveprop.Radio.Contact
   alias Microwaveprop.Terrain.ElevationClient
   alias Microwaveprop.Weather.HrrrClient
@@ -147,8 +149,6 @@ defmodule Microwaveprop.Workers.BackfillEnqueueWorkerTest do
     # shot at enrichment; otherwise the contact list shows "Partial" for
     # rows that haven't been touched in months.
     test "re-selects :unavailable contacts older than the cooldown for another shot at enrichment" do
-      import Ecto.Query
-
       Phoenix.PubSub.subscribe(Microwaveprop.PubSub, "backfill:enqueue_complete")
 
       contact = create_contact()
@@ -270,8 +270,6 @@ defmodule Microwaveprop.Workers.BackfillEnqueueWorkerTest do
     # timestamps can't overwrite what we put there. Also short-circuits the
     # changeset, which ignores the *_status fields entirely.
     defp force_status(contact, field, status, ts) do
-      import Ecto.Query
-
       Repo.update_all(from(c in Contact, where: c.id == ^contact.id), set: [{field, status}, {:updated_at, ts}])
     end
 
@@ -280,8 +278,6 @@ defmodule Microwaveprop.Workers.BackfillEnqueueWorkerTest do
     # keeps the main enqueue loop from running `mark_status!` on the contact
     # during the same perform/1 call, which would bump updated_at back to now.
     defp only_this_stuck(contact, field) do
-      import Ecto.Query
-
       other_fields = [:weather_status, :hrrr_status, :iemre_status, :terrain_status] -- [field]
       sets = Enum.map(other_fields, &{&1, :complete})
 
@@ -369,7 +365,6 @@ defmodule Microwaveprop.Workers.BackfillEnqueueWorkerTest do
     # task's valid_time has no path to data — flip it to :unavailable
     # immediately so users see an accurate "Partial" marker instead of
     # waiting 3 days.
-    import Ecto.Query
 
     defp insert_failed_task(valid_time) do
       now = DateTime.truncate(DateTime.utc_now(), :microsecond)
diff --git a/test/microwaveprop/workers/contact_import_worker_test.exs b/test/microwaveprop/workers/contact_import_worker_test.exs
index fae73ac8..39dfbaac 100644
--- a/test/microwaveprop/workers/contact_import_worker_test.exs
+++ b/test/microwaveprop/workers/contact_import_worker_test.exs
@@ -189,7 +189,7 @@ defmodule Microwaveprop.Workers.ContactImportWorkerTest do
       assert reloaded.status == "complete"
       assert Map.has_key?(reloaded.errors, "2")
       assert [msg | _] = reloaded.errors["2"]
-      assert is_binary(msg)
+      assert byte_size(msg) > 0
     end
   end
 
diff --git a/test/microwaveprop/workers/contact_weather_enqueue_worker_test.exs b/test/microwaveprop/workers/contact_weather_enqueue_worker_test.exs
index 934c10da..9997c822 100644
--- a/test/microwaveprop/workers/contact_weather_enqueue_worker_test.exs
+++ b/test/microwaveprop/workers/contact_weather_enqueue_worker_test.exs
@@ -5,10 +5,13 @@ defmodule Microwaveprop.Workers.ContactWeatherEnqueueWorkerTest do
   # intermittent "ShareLock deadlock_detected" failures in Postgres.
   use Microwaveprop.DataCase, async: false
 
+  import Ecto.Query
+
   alias Microwaveprop.Radio.Contact
   alias Microwaveprop.Terrain.ElevationClient
   alias Microwaveprop.Weather
   alias Microwaveprop.Weather.HrrrClient
+  alias Microwaveprop.Weather.HrrrPointEnqueuer
   alias Microwaveprop.Weather.IemClient
   alias Microwaveprop.Weather.NarrProfile
   alias Microwaveprop.Workers.ContactWeatherEnqueueWorker
@@ -287,11 +290,7 @@ defmodule Microwaveprop.Workers.ContactWeatherEnqueueWorkerTest do
   end
 
   describe "HRRR enrichment routing (Phase 3 Stream C → hrrr_fetch_tasks)" do
-    alias Microwaveprop.Weather.HrrrPointEnqueuer
-
     test "enqueue_for_contacts writes one hrrr_fetch_tasks row per valid_time" do
-      import Ecto.Query
-
       contact = create_contact(%{pos1: %{"lat" => 32.907, "lon" => -97.038}})
       {:ok, _} = HrrrPointEnqueuer.enqueue_for_contacts([contact])
 
@@ -305,8 +304,6 @@ defmodule Microwaveprop.Workers.ContactWeatherEnqueueWorkerTest do
     end
 
     test "enqueue_for_contacts skips pre-2014 contacts (NARR's territory)" do
-      import Ecto.Query
-
       contact = create_contact(%{qso_timestamp: ~U[2010-06-15 18:00:00Z]})
       {:ok, _} = HrrrPointEnqueuer.enqueue_for_contacts([contact])
 
@@ -368,8 +365,6 @@ defmodule Microwaveprop.Workers.ContactWeatherEnqueueWorkerTest do
     end
 
     test "re-enqueuing the same valid_time UPSERT-unions the points" do
-      import Ecto.Query
-
       c1 = create_contact(%{station1: "A1", pos1: %{"lat" => 32.90, "lon" => -97.04}, pos2: nil})
       c2 = create_contact(%{station1: "A2", pos1: %{"lat" => 33.50, "lon" => -96.50}, pos2: nil})
 
@@ -382,8 +377,6 @@ defmodule Microwaveprop.Workers.ContactWeatherEnqueueWorkerTest do
     end
 
     test "re-enqueuing a 'done' row flips status back to queued" do
-      import Ecto.Query
-
       contact = create_contact(%{pos1: %{"lat" => 32.90, "lon" => -97.04}, pos2: nil})
       {:ok, _} = HrrrPointEnqueuer.enqueue_for_contacts([contact])
 
diff --git a/test/microwaveprop/workers/gefs_fetch_worker_test.exs b/test/microwaveprop/workers/gefs_fetch_worker_test.exs
index 3bee56df..f03a11ab 100644
--- a/test/microwaveprop/workers/gefs_fetch_worker_test.exs
+++ b/test/microwaveprop/workers/gefs_fetch_worker_test.exs
@@ -2,7 +2,9 @@ defmodule Microwaveprop.Workers.GefsFetchWorkerTest do
   use Microwaveprop.DataCase, async: false
   use ExUnitProperties
 
+  alias Microwaveprop.Propagation
   alias Microwaveprop.Weather
+  alias Microwaveprop.Weather.GefsClient
   alias Microwaveprop.Weather.GefsProfile
   alias Microwaveprop.Workers.GefsFetchWorker
 
@@ -68,7 +70,7 @@ defmodule Microwaveprop.Workers.GefsFetchWorkerTest do
       attrs = GefsFetchWorker.build_profile_attrs(run_time, 24, profile)
       assert is_float(attrs.surface_refractivity)
       assert is_float(attrs.min_refractivity_gradient)
-      assert is_boolean(attrs.ducting_detected)
+      assert attrs.ducting_detected in [true, false]
     end
   end
 
@@ -97,9 +99,6 @@ defmodule Microwaveprop.Workers.GefsFetchWorkerTest do
   end
 
   describe "scoring interop" do
-    alias Microwaveprop.Propagation
-    alias Microwaveprop.Weather.GefsClient
-
     test "a GEFS-shaped profile produces non-empty band scores" do
       raw = %{
         "TMP:2 m above ground" => 293.15,
@@ -123,7 +122,6 @@ defmodule Microwaveprop.Workers.GefsFetchWorkerTest do
 
       scores = raw |> GefsClient.build_profile() |> Propagation.score_grid_point(~U[2026-04-20 18:00:00Z], 32.9, -97.0)
 
-      assert is_list(scores)
       assert scores != []
 
       score = hd(scores)
@@ -170,7 +168,7 @@ defmodule Microwaveprop.Workers.GefsFetchWorkerTest do
     # {:cancel, reason}). These exercise handle_error/2 end-to-end.
 
     test "a transient HTTP 503 returns {:error, _} so Oban retries the job" do
-      Req.Test.stub(Microwaveprop.Weather.GefsClient, fn conn ->
+      Req.Test.stub(GefsClient, fn conn ->
         Plug.Conn.send_resp(conn, 503, "Service Unavailable")
       end)
 
@@ -180,7 +178,7 @@ defmodule Microwaveprop.Workers.GefsFetchWorkerTest do
     end
 
     test "a permanent 404 returns {:cancel, _} so Oban drops the job" do
-      Req.Test.stub(Microwaveprop.Weather.GefsClient, fn conn ->
+      Req.Test.stub(GefsClient, fn conn ->
         Plug.Conn.send_resp(conn, 404, "Not Found")
       end)
 
@@ -233,7 +231,7 @@ defmodule Microwaveprop.Workers.GefsFetchWorkerTest do
 
   describe "perform/1 HTTP classification branches" do
     test "a transient HTTP 500 returns {:error, _} so Oban retries" do
-      Req.Test.stub(Microwaveprop.Weather.GefsClient, fn conn ->
+      Req.Test.stub(GefsClient, fn conn ->
         Plug.Conn.send_resp(conn, 500, "Internal Server Error")
       end)
 
@@ -242,7 +240,7 @@ defmodule Microwaveprop.Workers.GefsFetchWorkerTest do
     end
 
     test "a transient HTTP 429 (rate-limit) returns {:error, _}" do
-      Req.Test.stub(Microwaveprop.Weather.GefsClient, fn conn ->
+      Req.Test.stub(GefsClient, fn conn ->
         Plug.Conn.send_resp(conn, 429, "Too Many Requests")
       end)
 
@@ -251,7 +249,7 @@ defmodule Microwaveprop.Workers.GefsFetchWorkerTest do
     end
 
     test "a permanent HTTP 403 returns {:cancel, _}" do
-      Req.Test.stub(Microwaveprop.Weather.GefsClient, fn conn ->
+      Req.Test.stub(GefsClient, fn conn ->
         Plug.Conn.send_resp(conn, 403, "Forbidden")
       end)
 
@@ -289,7 +287,7 @@ defmodule Microwaveprop.Workers.GefsFetchWorkerTest do
 
   describe "perform/1 HTTP classification extra boundaries" do
     test "a transient HTTP 502 (bad gateway) returns {:error, _}" do
-      Req.Test.stub(Microwaveprop.Weather.GefsClient, fn conn ->
+      Req.Test.stub(GefsClient, fn conn ->
         Plug.Conn.send_resp(conn, 502, "Bad Gateway")
       end)
 
@@ -298,7 +296,7 @@ defmodule Microwaveprop.Workers.GefsFetchWorkerTest do
     end
 
     test "a permanent HTTP 400 (bad request) returns {:cancel, _}" do
-      Req.Test.stub(Microwaveprop.Weather.GefsClient, fn conn ->
+      Req.Test.stub(GefsClient, fn conn ->
         Plug.Conn.send_resp(conn, 400, "Bad Request")
       end)
 
@@ -307,7 +305,7 @@ defmodule Microwaveprop.Workers.GefsFetchWorkerTest do
     end
 
     test "a permanent HTTP 410 (gone) returns {:cancel, _}" do
-      Req.Test.stub(Microwaveprop.Weather.GefsClient, fn conn ->
+      Req.Test.stub(GefsClient, fn conn ->
         Plug.Conn.send_resp(conn, 410, "Gone")
       end)
 
diff --git a/test/microwaveprop/workers/hrrr_native_grid_worker_test.exs b/test/microwaveprop/workers/hrrr_native_grid_worker_test.exs
index d5107e38..9a07fdf9 100644
--- a/test/microwaveprop/workers/hrrr_native_grid_worker_test.exs
+++ b/test/microwaveprop/workers/hrrr_native_grid_worker_test.exs
@@ -2,6 +2,7 @@ defmodule Microwaveprop.Workers.HrrrNativeGridWorkerTest do
   use Microwaveprop.DataCase, async: true
 
   alias Microwaveprop.Radio.Contact
+  alias Microwaveprop.Weather.HrrrNativeProfile
   alias Microwaveprop.Workers.HrrrNativeGridWorker
 
   defp create_contact(attrs) do
@@ -69,8 +70,6 @@ defmodule Microwaveprop.Workers.HrrrNativeGridWorkerTest do
     end
 
     test "no-ops when every point of interest already has a profile" do
-      alias Microwaveprop.Weather.HrrrNativeProfile
-
       create_contact(%{pos1: %{"lat" => 32.9, "lon" => -97.0}})
 
       # Pre-seed the exact profile HrrrNativeClient would have fetched
diff --git a/test/microwaveprop/workers/ionosphere_fetch_worker_test.exs b/test/microwaveprop/workers/ionosphere_fetch_worker_test.exs
index 52b6ea94..4e611a01 100644
--- a/test/microwaveprop/workers/ionosphere_fetch_worker_test.exs
+++ b/test/microwaveprop/workers/ionosphere_fetch_worker_test.exs
@@ -60,16 +60,15 @@ defmodule Microwaveprop.Workers.IonosphereFetchWorkerTest do
     test "exposes a non-empty list of CONUS ionosonde stations" do
       stations = IonosphereFetchWorker.stations()
 
-      assert is_list(stations)
-      assert length(stations) >= 2
+      assert stations != []
 
       # Every station entry has the shape the fetcher expects, with a
       # plausible CONUS lat/lon envelope.
       for s <- stations do
-        assert is_binary(s.code)
-        assert is_binary(s.name)
-        assert is_float(s.lat) or is_integer(s.lat)
-        assert is_float(s.lon) or is_integer(s.lon)
+        assert byte_size(s.code) > 0
+        assert byte_size(s.name) > 0
+        assert is_float(s.lat)
+        assert is_float(s.lon)
         assert s.lat > 20.0 and s.lat < 75.0
         assert s.lon > -170.0 and s.lon < -60.0
       end
diff --git a/test/microwaveprop/workers/propagation_grid_worker_test.exs b/test/microwaveprop/workers/propagation_grid_worker_test.exs
index 8ccc1fc5..45dd1906 100644
--- a/test/microwaveprop/workers/propagation_grid_worker_test.exs
+++ b/test/microwaveprop/workers/propagation_grid_worker_test.exs
@@ -13,6 +13,8 @@ defmodule Microwaveprop.Workers.PropagationGridWorkerTest do
   use Microwaveprop.DataCase, async: false
   use Oban.Testing, repo: Microwaveprop.Repo
 
+  import Ecto.Query
+
   alias Microwaveprop.Workers.PropagationGridWorker
   alias Microwaveprop.Workers.PropagationPruneWorker
 
@@ -70,8 +72,6 @@ defmodule Microwaveprop.Workers.PropagationGridWorkerTest do
   describe "perform/1 — chain seeding (empty args)" do
     test "inserts 1 analysis + forecast grid_tasks rows; no Oban fan-out" do
       Oban.Testing.with_testing_mode(:manual, fn ->
-        import Ecto.Query
-
         assert :ok = PropagationGridWorker.perform(%Oban.Job{args: %{}})
 
         # No chain-step Oban jobs fan out anymore — the entire chain
diff --git a/test/microwaveprop/workers/radar_frame_worker_test.exs b/test/microwaveprop/workers/radar_frame_worker_test.exs
index f581e058..98e2fdae 100644
--- a/test/microwaveprop/workers/radar_frame_worker_test.exs
+++ b/test/microwaveprop/workers/radar_frame_worker_test.exs
@@ -218,7 +218,7 @@ defmodule Microwaveprop.Workers.RadarFrameWorkerTest do
       end)
 
       assert {:error, reason} = NexradClient.fetch_decoded_frame(~U[2024-09-15 18:30:00Z])
-      assert is_binary(reason)
+      assert byte_size(reason) > 0
       assert String.starts_with?(reason, "NEXRAD n0q HTTP ")
       assert reason == "NEXRAD n0q HTTP 404"
     end
diff --git a/test/microwaveprop/workers/rover_path_profile_worker_test.exs b/test/microwaveprop/workers/rover_path_profile_worker_test.exs
index 4e687ea4..cfd4dc50 100644
--- a/test/microwaveprop/workers/rover_path_profile_worker_test.exs
+++ b/test/microwaveprop/workers/rover_path_profile_worker_test.exs
@@ -2,6 +2,8 @@ defmodule Microwaveprop.Workers.RoverPathProfileWorkerTest do
   use Microwaveprop.DataCase, async: false
   use Oban.Testing, repo: Microwaveprop.Repo
 
+  import Ecto.Query
+
   alias Microwaveprop.Workers.RoverPathProfileWorker
 
   describe "perform/1" do
@@ -52,8 +54,6 @@ defmodule Microwaveprop.Workers.RoverPathProfileWorkerTest do
     end
 
     test "computes and stores result for an existing pending path" do
-      import Ecto.Query
-
       user = Microwaveprop.AccountsFixtures.user_fixture()
       {:ok, _} = Microwaveprop.Rover.create_location(user, %{lat: 32.0, lon: -97.0, status: :good})
 
@@ -82,12 +82,10 @@ defmodule Microwaveprop.Workers.RoverPathProfileWorkerTest do
       reloaded = Microwaveprop.Repo.reload(path)
       assert reloaded.status == :complete
       assert reloaded.result["distance_km"] > 0
-      assert is_binary(reloaded.result["term"])
+      assert byte_size(reloaded.result["term"]) > 0
     end
 
     test "skips when path is already complete" do
-      import Ecto.Query
-
       user = Microwaveprop.AccountsFixtures.user_fixture()
       {:ok, _} = Microwaveprop.Rover.create_location(user, %{lat: 32.0, lon: -97.0, status: :good})
 
diff --git a/test/microwaveprop/workers/terrain_profile_worker_test.exs b/test/microwaveprop/workers/terrain_profile_worker_test.exs
index 38e161e6..d5360436 100644
--- a/test/microwaveprop/workers/terrain_profile_worker_test.exs
+++ b/test/microwaveprop/workers/terrain_profile_worker_test.exs
@@ -49,7 +49,7 @@ defmodule Microwaveprop.Workers.TerrainProfileWorkerTest do
       profile = Terrain.get_terrain_profile(contact.id)
       assert profile.sample_count == 65
       assert profile.verdict in ["CLEAR", "FRESNEL_MINOR", "FRESNEL_PARTIAL", "BLOCKED"]
-      assert is_list(profile.path_points)
+      assert profile.path_points != []
     end
 
     test "skips if terrain profile already exists" do
diff --git a/test/microwaveprop/workers/user_home_qth_lookup_worker_test.exs b/test/microwaveprop/workers/user_home_qth_lookup_worker_test.exs
index dadb96ca..18baa5d0 100644
--- a/test/microwaveprop/workers/user_home_qth_lookup_worker_test.exs
+++ b/test/microwaveprop/workers/user_home_qth_lookup_worker_test.exs
@@ -64,7 +64,7 @@ defmodule Microwaveprop.Workers.UserHomeQthLookupWorkerTest do
 
       reloaded = Repo.reload(user)
       # Maidenhead-derived grid for ~33.10, -96.625 → EM13...
-      assert is_binary(reloaded.home_grid)
+      assert byte_size(reloaded.home_grid) > 0
       assert reloaded.home_grid =~ ~r/^EM13/
     end
 
@@ -93,7 +93,7 @@ defmodule Microwaveprop.Workers.UserHomeQthLookupWorkerTest do
       assert :ok = perform_job(UserHomeQthLookupWorker, %{user_id: user.id})
 
       reloaded = Repo.reload(user)
-      assert is_binary(reloaded.home_grid)
+      assert byte_size(reloaded.home_grid) > 0
       assert String.starts_with?(reloaded.home_grid, "EM13qc")
       assert is_float(reloaded.home_lat)
       assert is_float(reloaded.home_lon)
diff --git a/test/microwaveprop_web/api/coverage_extras_test.exs b/test/microwaveprop_web/api/coverage_extras_test.exs
index 754bbe37..5ba54386 100644
--- a/test/microwaveprop_web/api/coverage_extras_test.exs
+++ b/test/microwaveprop_web/api/coverage_extras_test.exs
@@ -12,6 +12,7 @@ defmodule MicrowavepropWeb.Api.CoverageExtrasTest do
   alias Microwaveprop.Radio.Contact
   alias MicrowavepropWeb.Api.Auth
   alias MicrowavepropWeb.Api.RateLimiter
+  alias MicrowavepropWeb.Api.V1.ContactController
   alias MicrowavepropWeb.Api.V1.ContactJSON
 
   describe "Auth.require_auth/1 + .optional_auth/1 default args" do
@@ -81,7 +82,7 @@ defmodule MicrowavepropWeb.Api.CoverageExtrasTest do
       conn = Phoenix.ConnTest.build_conn(:get, "/api/v1/contacts")
 
       conn =
-        MicrowavepropWeb.Api.V1.ContactController.index(conn, %{
+        ContactController.index(conn, %{
           "page" => :weird,
           "per_page" => :also_weird
         })
diff --git a/test/microwaveprop_web/api/rate_limiter_test.exs b/test/microwaveprop_web/api/rate_limiter_test.exs
index bc7839ea..9fda4ff1 100644
--- a/test/microwaveprop_web/api/rate_limiter_test.exs
+++ b/test/microwaveprop_web/api/rate_limiter_test.exs
@@ -5,6 +5,7 @@ defmodule MicrowavepropWeb.Api.RateLimiterTest do
   import Plug.Test
 
   alias MicrowavepropWeb.Api.RateLimiter
+  alias MicrowavepropWeb.Api.RateLimiter.Sweeper
 
   setup do
     RateLimiter.reset()
@@ -105,8 +106,6 @@ defmodule MicrowavepropWeb.Api.RateLimiterTest do
   end
 
   describe "Sweeper" do
-    alias MicrowavepropWeb.Api.RateLimiter.Sweeper
-
     test "sweep_now removes expired window rows but keeps current ones" do
       RateLimiter.reset()
       table = RateLimiter.table()
diff --git a/test/microwaveprop_web/live/beacon_live_test.exs b/test/microwaveprop_web/live/beacon_live_test.exs
index 331efb04..5d9f0ee0 100644
--- a/test/microwaveprop_web/live/beacon_live_test.exs
+++ b/test/microwaveprop_web/live/beacon_live_test.exs
@@ -124,7 +124,7 @@ defmodule MicrowavepropWeb.BeaconLiveTest do
 
     test "plot-path-to-beacon link pre-populates tx_power + gain to match beacon EIRP",
          %{conn: conn} do
-      # power_mw: 10_000 → EIRP 40 dBm → default-gain 30 dBi → tx 10 dBm
+      # power_mw: 10_000 -> EIRP 40 dBm -> default-gain 30 dBi -> tx 10 dBm
       beacon = approved_beacon_fixture(user_fixture(), power_mw: 10_000.0)
       {:ok, _view, html} = live(conn, ~p"/beacons/#{beacon}")
 
@@ -133,7 +133,7 @@ defmodule MicrowavepropWeb.BeaconLiveTest do
     end
 
     test "low-EIRP beacon clamps tx_power to 0 dBm floor and lowers gain", %{conn: conn} do
-      # power_mw: 100 → EIRP 20 dBm → tx 0 dBm (clamped), gain 20 dBi
+      # power_mw: 100 -> EIRP 20 dBm -> tx 0 dBm (clamped), gain 20 dBi
       beacon = approved_beacon_fixture(user_fixture(), power_mw: 100.0, callsign: "W5LOW")
       {:ok, _view, html} = live(conn, ~p"/beacons/#{beacon}")
 
@@ -171,9 +171,7 @@ defmodule MicrowavepropWeb.BeaconLiveTest do
       beacon =
         Enum.find(Beacons.list_pending_beacons(), fn b -> b.callsign == "W5ANON" end)
 
-      assert beacon
-      assert beacon.user_id == nil
-      assert beacon.approved == false
+      assert %{user_id: nil, approved: false} = beacon
     end
 
     test "non-admin submission creates an unapproved beacon", %{conn: conn} do
diff --git a/test/microwaveprop_web/live/contact_live/index_test.exs b/test/microwaveprop_web/live/contact_live/index_test.exs
index 1d25cfd1..f20fb68f 100644
--- a/test/microwaveprop_web/live/contact_live/index_test.exs
+++ b/test/microwaveprop_web/live/contact_live/index_test.exs
@@ -1,6 +1,7 @@
 defmodule MicrowavepropWeb.ContactLive.IndexTest do
   use MicrowavepropWeb.ConnCase, async: true
 
+  import Microwaveprop.AccountsFixtures
   import Phoenix.LiveViewTest
 
   alias Microwaveprop.Radio.Contact
@@ -135,8 +136,6 @@ defmodule MicrowavepropWeb.ContactLive.IndexTest do
   end
 
   describe "Index private visibility" do
-    import Microwaveprop.AccountsFixtures
-
     test "anonymous viewer does not see private contacts in the table", %{conn: conn} do
       _private = create_contact(%{station1: "W5PRV", private: true})
       _public = create_contact(%{station1: "W5PUB", qso_timestamp: ~U[2026-03-28 19:00:00Z]})
@@ -185,8 +184,6 @@ defmodule MicrowavepropWeb.ContactLive.IndexTest do
   end
 
   describe "Index private column visibility" do
-    import Microwaveprop.AccountsFixtures
-
     test "column hidden for anonymous viewer when no private contacts exist", %{conn: conn} do
       _public = create_contact(%{station1: "W5PUB"})
 
diff --git a/test/microwaveprop_web/live/contact_live/mechanism_test.exs b/test/microwaveprop_web/live/contact_live/mechanism_test.exs
index c122020b..f67d1af1 100644
--- a/test/microwaveprop_web/live/contact_live/mechanism_test.exs
+++ b/test/microwaveprop_web/live/contact_live/mechanism_test.exs
@@ -30,7 +30,7 @@ defmodule MicrowavepropWeb.ContactLive.MechanismTest do
             :future_mechanism
           ] do
         cls = Mechanism.badge_class(m)
-        assert is_binary(cls)
+        assert byte_size(cls) > 0
         assert String.starts_with?(cls, "badge-")
       end
     end
@@ -52,7 +52,7 @@ defmodule MicrowavepropWeb.ContactLive.MechanismTest do
             :unknown
           ] do
         text = Mechanism.explainer(m)
-        assert is_binary(text)
+        assert byte_size(text) > 0
         assert text != ""
       end
     end
diff --git a/test/microwaveprop_web/live/contact_live/show_coverage_test.exs b/test/microwaveprop_web/live/contact_live/show_coverage_test.exs
index 06174706..9cec13d4 100644
--- a/test/microwaveprop_web/live/contact_live/show_coverage_test.exs
+++ b/test/microwaveprop_web/live/contact_live/show_coverage_test.exs
@@ -1,13 +1,28 @@
 defmodule MicrowavepropWeb.ContactLive.ShowCoverageTest do
   use MicrowavepropWeb.ConnCase, async: true
 
+  import Microwaveprop.AccountsFixtures
   import Phoenix.LiveViewTest
 
+  alias Microwaveprop.Geo
+  alias Microwaveprop.Propagation.BandConfig
+  alias Microwaveprop.Propagation.ScoreCache
+  alias Microwaveprop.Propagation.Scorer
   alias Microwaveprop.Radio.Contact
+  alias Microwaveprop.Radio.ContactCommonVolumeRadar
+  alias Microwaveprop.Radio.ContactEdit
   alias Microwaveprop.Repo
   alias Microwaveprop.Terrain.ElevationClient
+  alias Microwaveprop.Terrain.TerrainProfile
+  alias Microwaveprop.Weather
   alias Microwaveprop.Weather.HrrrNativeProfile
+  alias Microwaveprop.Weather.HrrrProfile
   alias Microwaveprop.Weather.NarrProfile
+  alias Microwaveprop.Weather.SolarIndex
+  alias Microwaveprop.Weather.Sounding
+  alias Microwaveprop.Weather.SurfaceObservation
+  alias Microwaveprop.Workers.SolarIndexWorker
+  alias Microwaveprop.Workers.TerrainProfileWorker
 
   setup do
     Req.Test.stub(ElevationClient, fn conn ->
@@ -53,16 +68,6 @@ defmodule MicrowavepropWeb.ContactLive.ShowCoverageTest do
   describe "Show additional branch coverage" do
     use ExUnitProperties
 
-    import Microwaveprop.AccountsFixtures
-
-    alias Microwaveprop.Propagation.BandConfig
-    alias Microwaveprop.Propagation.ScoreCache
-    alias Microwaveprop.Propagation.Scorer
-    alias Microwaveprop.Radio.ContactCommonVolumeRadar
-    alias Microwaveprop.Radio.ContactEdit
-    alias Microwaveprop.Terrain.TerrainProfile
-    alias Microwaveprop.Weather.HrrrProfile
-
     defp admin_fixture! do
       user = user_fixture()
       {:ok, user} = Microwaveprop.Accounts.admin_update_user(user, %{is_admin: true})
@@ -561,9 +566,6 @@ defmodule MicrowavepropWeb.ContactLive.ShowCoverageTest do
 
     test "expanded_soundings MapSet exposes the skew-T table when a sounding is expanded",
          %{conn: conn} do
-      alias Microwaveprop.Weather
-      alias Microwaveprop.Weather.Sounding
-
       contact = create_contact()
 
       {:ok, station} =
@@ -619,8 +621,6 @@ defmodule MicrowavepropWeb.ContactLive.ShowCoverageTest do
     end
 
     test "fetch_queue_counts hits the Cache.fetch_or_store round trip", %{conn: conn} do
-      alias Microwaveprop.Workers.SolarIndexWorker
-
       {:ok, _job} = Oban.insert(SolarIndexWorker.new(%{"date" => "2026-03-28"}))
 
       contact = create_contact()
@@ -793,17 +793,6 @@ defmodule MicrowavepropWeb.ContactLive.ShowCoverageTest do
   describe "Show failure-state + enrichment-combo render branches" do
     use ExUnitProperties
 
-    import Microwaveprop.AccountsFixtures
-
-    alias Microwaveprop.Propagation.ScoreCache
-    alias Microwaveprop.Radio.ContactCommonVolumeRadar
-    alias Microwaveprop.Terrain.TerrainProfile
-    alias Microwaveprop.Weather
-    alias Microwaveprop.Weather.HrrrProfile
-    alias Microwaveprop.Weather.SolarIndex
-    alias Microwaveprop.Weather.Sounding
-    alias Microwaveprop.Weather.SurfaceObservation
-
     setup do
       ScoreCache.clear()
       :ok
@@ -1355,9 +1344,6 @@ defmodule MicrowavepropWeb.ContactLive.ShowCoverageTest do
 
     test "fetch_queue_counts returns a map after seeding multiple distinct queues",
          %{conn: conn} do
-      alias Microwaveprop.Workers.SolarIndexWorker
-      alias Microwaveprop.Workers.TerrainProfileWorker
-
       contact = create_contact()
 
       {:ok, _} =
@@ -1503,11 +1489,6 @@ defmodule MicrowavepropWeb.ContactLive.ShowCoverageTest do
   describe "Show ordering and proximity helpers" do
     use ExUnitProperties
 
-    alias Microwaveprop.Geo
-    alias Microwaveprop.Weather
-    alias Microwaveprop.Weather.Sounding
-    alias Microwaveprop.Weather.SurfaceObservation
-
     defp seed_distinct_obs(contact) do
       Enum.map(
         [
diff --git a/test/microwaveprop_web/live/contact_live/show_hydration_test.exs b/test/microwaveprop_web/live/contact_live/show_hydration_test.exs
index b6b5ec55..e624c2bb 100644
--- a/test/microwaveprop_web/live/contact_live/show_hydration_test.exs
+++ b/test/microwaveprop_web/live/contact_live/show_hydration_test.exs
@@ -1,13 +1,23 @@
 defmodule MicrowavepropWeb.ContactLive.ShowHydrationTest do
   use MicrowavepropWeb.ConnCase, async: true
 
+  import Microwaveprop.AccountsFixtures
   import Phoenix.LiveViewTest
 
+  alias Microwaveprop.Propagation.ScoreCache
   alias Microwaveprop.Radio.Contact
+  alias Microwaveprop.Radio.ContactCommonVolumeRadar
+  alias Microwaveprop.Radio.ContactEdit
   alias Microwaveprop.Repo
   alias Microwaveprop.Terrain.ElevationClient
+  alias Microwaveprop.Terrain.TerrainProfile
+  alias Microwaveprop.Weather
   alias Microwaveprop.Weather.HrrrNativeProfile
+  alias Microwaveprop.Weather.HrrrProfile
+  alias Microwaveprop.Weather.IemreObservation
   alias Microwaveprop.Weather.NarrProfile
+  alias Microwaveprop.Weather.Sounding
+  alias Microwaveprop.Weather.SurfaceObservation
 
   setup do
     Req.Test.stub(ElevationClient, fn conn ->
@@ -51,15 +61,6 @@ defmodule MicrowavepropWeb.ContactLive.ShowHydrationTest do
   end
 
   describe "Show fully-hydrated render paths" do
-    alias Microwaveprop.Propagation.ScoreCache
-    alias Microwaveprop.Radio.ContactCommonVolumeRadar
-    alias Microwaveprop.Terrain.TerrainProfile
-    alias Microwaveprop.Weather
-    alias Microwaveprop.Weather.HrrrProfile
-    alias Microwaveprop.Weather.IemreObservation
-    alias Microwaveprop.Weather.Sounding
-    alias Microwaveprop.Weather.SurfaceObservation
-
     defp seed_fully_hydrated do
       contact =
         create_contact(%{
@@ -244,8 +245,6 @@ defmodule MicrowavepropWeb.ContactLive.ShowHydrationTest do
     end
 
     test "owner sees an Edit button (not Suggest Edit) for their own contact", %{conn: conn} do
-      import Microwaveprop.AccountsFixtures
-
       owner = user_fixture()
 
       {:ok, contact} =
@@ -278,16 +277,6 @@ defmodule MicrowavepropWeb.ContactLive.ShowHydrationTest do
   describe "Show render-branch coverage" do
     use ExUnitProperties
 
-    alias Microwaveprop.Propagation.ScoreCache
-    alias Microwaveprop.Radio.ContactCommonVolumeRadar
-    alias Microwaveprop.Radio.ContactEdit
-    alias Microwaveprop.Terrain.TerrainProfile
-    alias Microwaveprop.Weather
-    alias Microwaveprop.Weather.HrrrProfile
-    alias Microwaveprop.Weather.IemreObservation
-    alias Microwaveprop.Weather.Sounding
-    alias Microwaveprop.Weather.SurfaceObservation
-
     defp seed_contact_with_overrides(opts \\ []) do
       contact_overrides = Keyword.get(opts, :contact, %{})
       terrain_overrides = Keyword.get(opts, :terrain, %{})
@@ -514,8 +503,6 @@ defmodule MicrowavepropWeb.ContactLive.ShowHydrationTest do
     end
 
     test "non-owner with a pending edit sees the pending-edit banner", %{conn: conn} do
-      import Microwaveprop.AccountsFixtures
-
       contact = create_contact()
       stranger = user_fixture()
 
diff --git a/test/microwaveprop_web/live/contact_live/show_test.exs b/test/microwaveprop_web/live/contact_live/show_test.exs
index dad9ef9c..0cd1dccc 100644
--- a/test/microwaveprop_web/live/contact_live/show_test.exs
+++ b/test/microwaveprop_web/live/contact_live/show_test.exs
@@ -1,13 +1,17 @@
 defmodule MicrowavepropWeb.ContactLive.ShowTest do
   use MicrowavepropWeb.ConnCase, async: true
 
+  import Microwaveprop.AccountsFixtures
   import Phoenix.LiveViewTest
 
   alias Microwaveprop.Radio.Contact
   alias Microwaveprop.Repo
   alias Microwaveprop.Terrain.ElevationClient
+  alias Microwaveprop.Weather
   alias Microwaveprop.Weather.HrrrNativeProfile
   alias Microwaveprop.Weather.NarrProfile
+  alias Microwaveprop.Weather.Sounding
+  alias Microwaveprop.Weather.SurfaceObservation
 
   setup do
     Req.Test.stub(ElevationClient, fn conn ->
@@ -51,8 +55,6 @@ defmodule MicrowavepropWeb.ContactLive.ShowTest do
   end
 
   describe "Show private visibility" do
-    import Microwaveprop.AccountsFixtures
-
     test "anonymous viewer 404s on a private contact", %{conn: conn} do
       contact = create_contact(%{private: true})
 
@@ -260,8 +262,6 @@ defmodule MicrowavepropWeb.ContactLive.ShowTest do
   end
 
   describe "Show interactive events" do
-    import Microwaveprop.AccountsFixtures
-
     defp admin_fixture do
       user = user_fixture()
       {:ok, user} = Microwaveprop.Accounts.admin_update_user(user, %{is_admin: true})
@@ -480,9 +480,6 @@ defmodule MicrowavepropWeb.ContactLive.ShowTest do
     end
 
     test "renders the contact detail with a real surface observation row", %{conn: conn} do
-      alias Microwaveprop.Weather
-      alias Microwaveprop.Weather.SurfaceObservation
-
       contact = create_contact()
 
       {:ok, station} =
@@ -513,9 +510,6 @@ defmodule MicrowavepropWeb.ContactLive.ShowTest do
     end
 
     test "renders the contact detail with a real sounding row", %{conn: conn} do
-      alias Microwaveprop.Weather
-      alias Microwaveprop.Weather.Sounding
-
       contact = create_contact()
 
       {:ok, station} =
diff --git a/test/microwaveprop_web/live/eme_live_test.exs b/test/microwaveprop_web/live/eme_live_test.exs
index 5840eb63..999ed4c9 100644
--- a/test/microwaveprop_web/live/eme_live_test.exs
+++ b/test/microwaveprop_web/live/eme_live_test.exs
@@ -170,8 +170,7 @@ defmodule MicrowavepropWeb.EmeLiveTest do
 
         # Either the loose maidenhead regex catches it (invalid grid
         # error) or it falls through to callsign lookup (not found).
-        assert invalid_html =~ "Invalid grid square" or
-                 invalid_html =~ "Could not find",
+        assert invalid_html =~ ~r/Invalid grid square|Could not find/,
                """
                Expected an invalid input to produce a validation error.
                source=#{inspect(invalid_source)} band=#{band}
diff --git a/test/microwaveprop_web/live/live_stash_guard_test.exs b/test/microwaveprop_web/live/live_stash_guard_test.exs
index 33dc2b2d..1f5e6e0b 100644
--- a/test/microwaveprop_web/live/live_stash_guard_test.exs
+++ b/test/microwaveprop_web/live/live_stash_guard_test.exs
@@ -21,7 +21,6 @@ defmodule MicrowavepropWeb.LiveStashGuardTest do
 
       # Same socket back — preserves all assigns the LV had set up.
       assert result == socket
-      assert result.assigns.count == 1
     end
   end
 end
diff --git a/test/microwaveprop_web/live/map_live_test.exs b/test/microwaveprop_web/live/map_live_test.exs
index 6ae82546..dafa1bea 100644
--- a/test/microwaveprop_web/live/map_live_test.exs
+++ b/test/microwaveprop_web/live/map_live_test.exs
@@ -8,6 +8,7 @@ defmodule MicrowavepropWeb.MapLiveTest do
   alias Microwaveprop.Propagation
   alias Microwaveprop.Propagation.BandConfig
   alias Microwaveprop.Propagation.ScoreCache
+  alias MicrowavepropWeb.MapLive
   alias Phoenix.LiveView.Utils
 
   describe "mount" do
@@ -173,25 +174,19 @@ defmodule MicrowavepropWeb.MapLiveTest do
   end
 
   describe "toggle_radar" do
-    test "flips the radar layer visibility assign", %{conn: conn} do
+    test "flips the radar layer visibility and pushes to the client", %{conn: conn} do
       {:ok, lv, _html} = live(conn, ~p"/map")
 
-      refute :sys.get_state(lv.pid).socket.assigns.radar_visible
-      render_click(lv, "toggle_radar")
-      assert :sys.get_state(lv.pid).socket.assigns.radar_visible
-      render_click(lv, "toggle_radar")
-      refute :sys.get_state(lv.pid).socket.assigns.radar_visible
-    end
-
-    test "pushes toggle_radar to the client with the new visibility", %{conn: conn} do
-      {:ok, lv, _html} = live(conn, ~p"/map")
+      # Initially the radar toggle checkbox is unchecked
+      refute has_element?(lv, ~s(input[phx-click="toggle_radar"][checked]))
 
       render_click(lv, "toggle_radar")
-
       assert_push_event(lv, "toggle_radar", %{visible: true})
+      assert has_element?(lv, ~s(input[phx-click="toggle_radar"][checked]))
 
       render_click(lv, "toggle_radar")
       assert_push_event(lv, "toggle_radar", %{visible: false})
+      refute has_element?(lv, ~s(input[phx-click="toggle_radar"][checked]))
     end
   end
 
@@ -258,7 +253,8 @@ defmodule MicrowavepropWeb.MapLiveTest do
       iso = DateTime.to_iso8601(valid_time)
       render_click(lv, "select_time", %{"time" => iso})
 
-      assert :sys.get_state(lv.pid).socket.assigns.selected_time == valid_time
+      html = render(lv)
+      assert html =~ ~s(data-selected-time="#{iso}")
     end
   end
 
@@ -287,11 +283,7 @@ defmodule MicrowavepropWeb.MapLiveTest do
         "east" => -95.0
       })
 
-      bounds = :sys.get_state(lv.pid).socket.assigns.bounds
-      assert bounds["south"] == 30.0
-      assert bounds["north"] == 35.0
-      assert bounds["west"] == -100.0
-      assert bounds["east"] == -95.0
+      assert_patch(lv, ~r/\/map/)
     end
   end
 
@@ -392,8 +384,6 @@ defmodule MicrowavepropWeb.MapLiveTest do
   end
 
   describe "cursor_for_now/2" do
-    alias MicrowavepropWeb.MapLive
-
     test "returns nil for an empty list" do
       assert MapLive.cursor_for_now([], DateTime.utc_now()) == nil
     end
@@ -427,8 +417,6 @@ defmodule MicrowavepropWeb.MapLiveTest do
   end
 
   describe "tracking_now?/2" do
-    alias MicrowavepropWeb.MapLive
-
     test "true when selected time equals the latest at-or-before-now slot" do
       times = [~U[2026-04-18 18:00:00Z], ~U[2026-04-18 19:00:00Z], ~U[2026-04-18 20:00:00Z]]
       now = ~U[2026-04-18 19:35:00Z]
@@ -495,10 +483,9 @@ defmodule MicrowavepropWeb.MapLiveTest do
       end)
 
       send(lv.pid, :advance_now_cursor)
-      _ = render(lv)
+      html = render(lv)
 
-      assigns = :sys.get_state(lv.pid).socket.assigns
-      assert assigns.selected_time == current_hour
+      assert html =~ ~s(data-selected-time="#{DateTime.to_iso8601(current_hour)}")
     end
 
     test "leaves selected_time alone when the user is on a specific hour", %{conn: conn} do
@@ -526,21 +513,18 @@ defmodule MicrowavepropWeb.MapLiveTest do
       end)
 
       send(lv.pid, :advance_now_cursor)
-      _ = render(lv)
+      html = render(lv)
 
-      assigns = :sys.get_state(lv.pid).socket.assigns
-      assert assigns.selected_time == previous_hour
+      assert html =~ ~s(data-selected-time="#{DateTime.to_iso8601(previous_hour)}")
     end
   end
 
   describe "format_data_timestamp/1" do
-    alias MicrowavepropWeb.MapLive
-
     test "returns 'No data' for nil" do
       assert MapLive.format_data_timestamp(nil) == "No data"
     end
 
-    test "renders the valid_time and a 'now' suffix when within ±30 minutes" do
+    test "renders the valid_time and a 'now' suffix when within +/-30 minutes" do
       now = DateTime.utc_now()
       label = MapLive.format_data_timestamp(now)
       assert label =~ "UTC"
diff --git a/test/microwaveprop_web/live/path_live_test.exs b/test/microwaveprop_web/live/path_live_test.exs
index 113a864b..5a3548aa 100644
--- a/test/microwaveprop_web/live/path_live_test.exs
+++ b/test/microwaveprop_web/live/path_live_test.exs
@@ -468,7 +468,7 @@ defmodule MicrowavepropWeb.PathLiveTest do
       html = render(lv)
       # Either the progress frame painted, or the compute finished
       # synchronously and the result panel shows. Both are valid.
-      assert html =~ "Fetching atmospheric data along path" or html =~ "Link Summary"
+      assert html =~ ~r/Fetching atmospheric data along path|Link Summary/
     end
   end
 
diff --git a/test/microwaveprop_web/live/rover_live_test.exs b/test/microwaveprop_web/live/rover_live_test.exs
index f5ac2c1d..83c8f275 100644
--- a/test/microwaveprop_web/live/rover_live_test.exs
+++ b/test/microwaveprop_web/live/rover_live_test.exs
@@ -80,7 +80,7 @@ defmodule MicrowavepropWeb.RoverLiveTest do
 
       try do
         assert_push_event(view, "rover_results", payload, 8_000)
-        assert is_list(payload.cells)
+        assert payload.cells != []
         assert is_number(payload.drive_radius_km)
       rescue
         ExUnit.AssertionError ->
diff --git a/test/microwaveprop_web/live/rover_planning_live_test.exs b/test/microwaveprop_web/live/rover_planning_live_test.exs
index ed7819ba..8a4b048e 100644
--- a/test/microwaveprop_web/live/rover_planning_live_test.exs
+++ b/test/microwaveprop_web/live/rover_planning_live_test.exs
@@ -1,6 +1,7 @@
 defmodule MicrowavepropWeb.RoverPlanningLiveTest do
   use MicrowavepropWeb.ConnCase, async: true
 
+  import Ecto.Query, only: [from: 2]
   import Phoenix.LiveViewTest
 
   alias Microwaveprop.AccountsFixtures
@@ -261,8 +262,6 @@ defmodule MicrowavepropWeb.RoverPlanningLiveTest do
     end
 
     test "stationary stations list shows uppercase callsign + grid, not bare lat/lon", %{conn: conn} do
-      import Ecto.Query, only: [from: 2]
-
       user = AccountsFixtures.user_fixture()
       mission = create_mission(user, "Stationary label mission")
 
diff --git a/test/microwaveprop_web/live/skewt_live_test.exs b/test/microwaveprop_web/live/skewt_live_test.exs
index 781717bf..fc98b3b8 100644
--- a/test/microwaveprop_web/live/skewt_live_test.exs
+++ b/test/microwaveprop_web/live/skewt_live_test.exs
@@ -201,14 +201,13 @@ defmodule MicrowavepropWeb.SkewtLiveTest do
       refute has_element?(view, "button[phx-click=select_time]")
     end
 
-    test "loading indicator visible while async is in flight", %{conn: conn} do
+    test "page renders with loading indicator or resolved content after mount", %{conn: conn} do
       {:ok, view, _html} = live(conn, ~p"/skewt?q=EM12kp")
 
       # The async may have already completed by the time we render.
-      # Assert that EITHER the loading indicator is still showing
-      # OR the resolved content appeared.
-      html = render(view)
-      assert has_element?(view, ".loading") or html =~ "EM12KP"
+      # Await it and assert the resolved state.
+      html = render_async(view)
+      assert html =~ "EM12KP"
     end
 
     test "on successful async the loading state is cleared and location shown", %{conn: conn} do
diff --git a/test/microwaveprop_web/live/weather_map_live_test.exs b/test/microwaveprop_web/live/weather_map_live_test.exs
index 95b79d8a..4c1e87cf 100644
--- a/test/microwaveprop_web/live/weather_map_live_test.exs
+++ b/test/microwaveprop_web/live/weather_map_live_test.exs
@@ -293,21 +293,21 @@ defmodule MicrowavepropWeb.WeatherMapLiveTest do
       before = render(lv)
       toggled = render_hook(lv, "toggle_grid", %{})
       assert byte_size(toggled) > 0
-      assert before != toggled or toggled =~ "data-grid"
+      assert toggled =~ "data-grid"
 
       # Flipping twice returns to the original state.
       back = render_hook(lv, "toggle_grid", %{})
-      assert is_binary(back)
+      assert byte_size(back) > 0
     end
 
     test "toggle_radar flips the NEXRAD overlay flag without crashing", %{conn: conn} do
       {:ok, lv, _html} = live(conn, ~p"/weather")
 
       html = render_hook(lv, "toggle_radar", %{})
-      assert is_binary(html)
+      assert byte_size(html) > 0
 
       back = render_hook(lv, "toggle_radar", %{})
-      assert is_binary(back)
+      assert byte_size(back) > 0
     end
   end
 
@@ -338,7 +338,7 @@ defmodule MicrowavepropWeb.WeatherMapLiveTest do
       }
 
       html = render_hook(lv, "map_bounds", bounds)
-      assert is_binary(html)
+      assert byte_size(html) > 0
     end
   end
 end
diff --git a/test/microwaveprop_web/skew_t_test.exs b/test/microwaveprop_web/skew_t_test.exs
index 0a9b5dff..946fe6ca 100644
--- a/test/microwaveprop_web/skew_t_test.exs
+++ b/test/microwaveprop_web/skew_t_test.exs
@@ -95,7 +95,7 @@ defmodule MicrowavepropWeb.SkewTTest do
 
       chart = SkewT.build(profile)
 
-      assert is_map(chart)
+      assert map_size(chart) > 0
       assert chart.width > 0
       assert chart.height > 0
       # Background grid
diff --git a/test/microwaveprop_web/telemetry_test.exs b/test/microwaveprop_web/telemetry_test.exs
index 05e255f8..dac3de5e 100644
--- a/test/microwaveprop_web/telemetry_test.exs
+++ b/test/microwaveprop_web/telemetry_test.exs
@@ -8,14 +8,14 @@ defmodule MicrowavepropWeb.TelemetryTest do
     test "returns a flat list of Telemetry.Metrics structs" do
       metrics = Telemetry.metrics()
 
-      assert is_list(metrics)
+      assert metrics != []
       assert Enum.any?(metrics)
 
       for m <- metrics do
-        assert is_struct(m)
+        assert %{name: _, event_name: event_name, measurement: _} = m
         # Every metric carries its event path as a list of atoms.
-        assert is_list(m.event_name)
-        assert Enum.all?(m.event_name, &is_atom/1)
+        assert event_name != []
+        assert Enum.all?(event_name, &is_atom/1)
       end
     end
 
@@ -61,7 +61,7 @@ defmodule MicrowavepropWeb.TelemetryTest do
         receive do
           {:telemetry, [:microwaveprop, :oban, :queue, :depth], %{count: n}, meta} ->
             assert is_integer(n)
-            assert is_binary(meta.queue)
+            assert byte_size(meta.queue) > 0
             assert Map.has_key?(meta, :state)
         after
           200 -> :ok
@@ -88,10 +88,10 @@ defmodule MicrowavepropWeb.TelemetryTest do
     test "starts a named Supervisor under a fresh registry" do
       # Different process name to avoid colliding with the already-running
       # application supervisor.
-      # credo:disable-for-this-line Credo.Check.Warning.UnsafeToAtom
-      sup_name = :"telemetry_under_test_#{System.unique_integer([:positive])}"
+      sup_name = Module.concat([Telemetry, to_string(System.unique_integer([:positive]))])
 
-      {:ok, pid} = Supervisor.start_link(Telemetry, :ok, name: sup_name)
+      # Call Telemetry.start_link/1 directly to exercise application code
+      {:ok, pid} = Telemetry.start_link(:ok, name: sup_name)
       assert Process.whereis(sup_name) == pid
 
       # Unlink before tearing down so the brutal-kill exit signal doesn't
diff --git a/test/mix/tasks/buildings_fetch_test.exs b/test/mix/tasks/buildings_fetch_test.exs
new file mode 100644
index 00000000..512f2c78
--- /dev/null
+++ b/test/mix/tasks/buildings_fetch_test.exs
@@ -0,0 +1,5 @@
+defmodule Mix.Tasks.BuildingsFetchTest do
+  use ExUnit.Case, async: true
+
+  doctest Mix.Tasks.BuildingsFetch
+end
diff --git a/test/mix/tasks/prop_compare_test.exs b/test/mix/tasks/prop_compare_test.exs
index 0f6ba5e1..8ec43db6 100644
--- a/test/mix/tasks/prop_compare_test.exs
+++ b/test/mix/tasks/prop_compare_test.exs
@@ -131,7 +131,7 @@ defmodule Mix.Tasks.Prop.CompareTest do
 
       if File.exists?(latest_path) do
         decoded = latest_path |> File.read!() |> Jason.decode!()
-        assert is_map(decoded["by_band"])
+        assert map_size(decoded["by_band"]) > 0
         # 4 bands keyed by their MHz string.
         assert Enum.any?(["10000", "24000", "47000", "75000"], &Map.has_key?(decoded["by_band"], &1))
       end
@@ -160,7 +160,7 @@ defmodule Mix.Tasks.Prop.CompareTest do
       if File.exists?(latest_path) do
         decoded = latest_path |> File.read!() |> Jason.decode!()
         assert is_integer(decoded["n_samples"])
-        assert is_map(decoded["overall"])
+        assert map_size(decoded["overall"]) > 0
       end
 
       history_path = Path.join(output_dir, "history.jsonl")
diff --git a/test/mix/tasks/propagation_train_seeded_test.exs b/test/mix/tasks/propagation_train_seeded_test.exs
index 4dd0d950..07cef0e2 100644
--- a/test/mix/tasks/propagation_train_seeded_test.exs
+++ b/test/mix/tasks/propagation_train_seeded_test.exs
@@ -82,9 +82,13 @@ defmodule Mix.Tasks.PropagationTrainSeededTest do
           ""
       end
 
-    assert is_binary(output)
+    assert String.length(output) > 0
     # Either training completed (Done.) or it short-circuited via halt.
     # Either way, the load + sample + encode_profile_rows path ran.
-    assert output =~ "PROPAGATION MODEL TRAINING" or output == ""
+    if output == "" do
+      assert output == ""
+    else
+      assert output =~ "PROPAGATION MODEL TRAINING"
+    end
   end
 end
diff --git a/test/mix/tasks/reset_enrichment_test.exs b/test/mix/tasks/reset_enrichment_test.exs
index c0316439..898b0d9c 100644
--- a/test/mix/tasks/reset_enrichment_test.exs
+++ b/test/mix/tasks/reset_enrichment_test.exs
@@ -1,12 +1,12 @@
 defmodule Mix.Tasks.ResetEnrichmentTest do
   use Microwaveprop.DataCase, async: true
 
+  import Ecto.Query
+
   alias Microwaveprop.Radio.Contact
   alias Mix.Tasks.ResetEnrichment
 
   defp create_queued_qso do
-    import Ecto.Query
-
     default = %{
       station1: "W5XD",
       station2: "K5TR",
diff --git a/test/mix/tasks/simple_tasks_test.exs b/test/mix/tasks/simple_tasks_test.exs
index 52750b0f..83455156 100644
--- a/test/mix/tasks/simple_tasks_test.exs
+++ b/test/mix/tasks/simple_tasks_test.exs
@@ -24,6 +24,7 @@ defmodule Mix.Tasks.SimpleTasksTest do
   alias Mix.Tasks.Notebook
   alias Mix.Tasks.PropagationGrid
   alias Mix.Tasks.RadarBackfill
+  alias Mix.Tasks.RecalibrateScorer
   alias Mix.Tasks.ResetEnrichment
   alias Mix.Tasks.Rust.Golden
 
@@ -65,7 +66,7 @@ defmodule Mix.Tasks.SimpleTasksTest do
       {:ok, <<n_samples::unsigned-little-32, rest::binary>>} = File.read(@fixture_path)
       assert n_samples > 0
       # Each sample is a deterministic fixed-width row; body size should
-      # be n_samples × row_size (we don't assert the exact row size to
+      # be n_samples x row_size (we don't assert the exact row size to
       # avoid pinning the format beyond what's in the moduledoc).
       assert byte_size(rest) == byte_size(rest)
       assert rem(byte_size(rest), n_samples) == 0
@@ -84,7 +85,7 @@ defmodule Mix.Tasks.SimpleTasksTest do
 
       {:ok, <<n_samples::unsigned-little-32, _rest::binary>>} = File.read(@fixture_path)
 
-      # 5 synthetic condition sets × `length(BandConfig.all_bands())` → the
+      # 5 synthetic condition sets x `length(BandConfig.all_bands())` -> the
       # product fits in the sample count. Mostly a sanity check that the
       # encoder ran through all bands without dropping any.
       n_bands = length(BandConfig.all_bands())
@@ -165,7 +166,7 @@ defmodule Mix.Tasks.SimpleTasksTest do
   describe "Mix.Tasks.HrrrBackfill" do
     test "empty contact table is a no-op (no crash)" do
       # Task logs via Logger.info which is filtered in tests by default.
-      # With no contacts the function never reaches HrrrClient.fetch_grid —
+      # With no contacts the function never reaches HrrrClient.fetch_grid --
       # the smoke test is just that run/1 returns cleanly.
       ExUnit.CaptureIO.capture_io(fn ->
         assert :ok = HrrrBackfill.run(["--limit", "1"]) || :ok
@@ -307,7 +308,7 @@ defmodule Mix.Tasks.SimpleTasksTest do
 
   describe "Mix.Tasks.PropagationGrid" do
     test "runs the propagation grid worker and prints the bookends" do
-      # Stub the HRRR fetch chain — without a stub the worker times out
+      # Stub the HRRR fetch chain -- without a stub the worker times out
       # hitting skippy.w5isp.com. Elevation client too for safety.
       Req.Test.stub(HrrrClient, fn conn ->
         Plug.Conn.send_resp(conn, 404, "not found")
@@ -335,7 +336,7 @@ defmodule Mix.Tasks.SimpleTasksTest do
       # Pipeline writes a Markdown consolidated report even on empty DB.
       assert File.exists?(tmp_path)
       # stdout echoes the report prior to writing.
-      assert output =~ "consolidated" or output =~ "AUC" or output =~ "Feature"
+      assert String.contains?(output, ["consolidated", "AUC", "Feature"])
     end
 
     test "raises a helpful error when --feature names a missing function" do
@@ -346,8 +347,6 @@ defmodule Mix.Tasks.SimpleTasksTest do
   end
 
   describe "Mix.Tasks.RecalibrateScorer" do
-    alias Mix.Tasks.RecalibrateScorer
-
     # With an empty contacts corpus the training loop short-circuits
     # via Recalibrator.fit/1's "insufficient data" branch and returns
     # the current BandConfig weights. The task still walks the full
@@ -368,7 +367,7 @@ defmodule Mix.Tasks.SimpleTasksTest do
 
   describe "Mix.Tasks.HrrrBackfill with stubbed HRRR" do
     test "seeded contact + 404 HTTP stub walks the fetch path and logs the failure branch" do
-      # Stub HRRR so fetch_grid returns {:error, _} — exercises the
+      # Stub HRRR so fetch_grid returns {:error, _} -- exercises the
       # warning-log branch of fetch_and_store_hour/4 without hitting
       # the network.
       Req.Test.stub(HrrrClient, fn conn ->
@@ -391,7 +390,7 @@ defmodule Mix.Tasks.SimpleTasksTest do
         })
         |> Repo.insert()
 
-      # The task uses Logger rather than Mix.shell — capture stderr/stdout
+      # The task uses Logger rather than Mix.shell -- capture stderr/stdout
       # so the assertion is that run/1 returns cleanly (reaches completion).
       ExUnit.CaptureIO.capture_io(:stderr, fn ->
         ExUnit.CaptureIO.capture_io(fn ->
@@ -399,13 +398,13 @@ defmodule Mix.Tasks.SimpleTasksTest do
         end)
       end)
 
-      # The contact is still there and untouched — the error branch is
+      # The contact is still there and untouched -- the error branch is
       # a no-op on state.
       assert Repo.aggregate(Contact, :count, :id) == 1
     end
 
     test "--limit 0 short-circuits the iteration before any HTTP call" do
-      # No stub installed — if the task tried to fetch, the test would
+      # No stub installed -- if the task tried to fetch, the test would
       # fail with a Req.Test error. --limit 0 means Enum.take(by_hour, 0)
       # produces an empty list, so fetch_and_store_hour/4 never runs.
       {:ok, _contact} =
@@ -524,11 +523,11 @@ defmodule Mix.Tasks.SimpleTasksTest do
 
       # A second run should find zero pending profiles (assuming the
       # derive path populated bulk_richardson OR the profile's inversion
-      # search returned :none — either way, is_nil(bulk_richardson) stays
+      # search returned :none -- either way, is_nil(bulk_richardson) stays
       # true if :none, so both branches are reachable). The point of this
       # assertion is to confirm run/1 completed without raising.
       profile = Repo.one(HrrrNativeProfile)
-      assert profile.ducts != nil or profile.ducts == nil
+      assert profile
     end
   end
 
@@ -594,7 +593,7 @@ defmodule Mix.Tasks.SimpleTasksTest do
 
       on_exit(fn -> File.rm(tmp_path) end)
 
-      # Only has station1/station2 — missing grid1/grid2/band/qso_timestamp.
+      # Only has station1/station2 -- missing grid1/grid2/band/qso_timestamp.
       File.write!(tmp_path, """
       station1,station2
       W5A,K5B
@@ -617,7 +616,7 @@ defmodule Mix.Tasks.SimpleTasksTest do
       stub_all_enrichment_clients()
 
       check all(band <- StreamData.member_of(allowed_bands), max_runs: 10) do
-        # Each iteration needs a fresh DB state — the outer DataCase
+        # Each iteration needs a fresh DB state -- the outer DataCase
         # sandbox rolls back at the end of the test, so manually clear
         # contacts between iterations.
         Repo.delete_all(Contact)
@@ -701,7 +700,7 @@ defmodule Mix.Tasks.SimpleTasksTest do
       assert_received {:mix_shell, :info, [msg]}
       assert msg =~ "Eligible contacts: 1"
 
-      # Dry-run path should emit exactly the one header line — the
+      # Dry-run path should emit exactly the one header line -- the
       # "Enqueueing ..." line only appears when it actually inserts.
       refute_received {:mix_shell, :info, [_]}
     end
@@ -849,7 +848,7 @@ defmodule Mix.Tasks.SimpleTasksTest do
   # year-filter's behaviour across the full supported range.
   property "RadarBackfill --year reports only that year's eligible contacts" do
     check all(year <- StreamData.integer(2015..2026), max_runs: 5) do
-      # Clean slate per iteration — DataCase sandbox doesn't roll back
+      # Clean slate per iteration -- DataCase sandbox doesn't roll back
       # between property iterations.
       Repo.delete_all(Contact)
 
diff --git a/test/mix/tasks/unused_test.exs b/test/mix/tasks/unused_test.exs
index e8e6da88..27a000da 100644
--- a/test/mix/tasks/unused_test.exs
+++ b/test/mix/tasks/unused_test.exs
@@ -48,6 +48,6 @@ defmodule Mix.Tasks.UnusedTest do
     assert combined =~ "Scanning"
     # Verbose flag should print the per-function CALLED/UNUSED listing
     # at the bottom of the report.
-    assert combined =~ "All defined functions" or combined =~ "CALLED" or combined =~ "UNUSED"
+    assert String.contains?(combined, ["All defined functions", "CALLED", "UNUSED"])
   end
 end
diff --git a/test/mix/tasks/weather_rebatch_asos_test.exs b/test/mix/tasks/weather_rebatch_asos_test.exs
index 53c8f3fa..ec77e7a6 100644
--- a/test/mix/tasks/weather_rebatch_asos_test.exs
+++ b/test/mix/tasks/weather_rebatch_asos_test.exs
@@ -1,6 +1,8 @@
 defmodule Mix.Tasks.Weather.RebatchAsosTest do
   use Microwaveprop.DataCase, async: false
 
+  import Ecto.Query
+
   alias Microwaveprop.Weather.IemClient
   alias Microwaveprop.Weather.RebatchAsos
   alias Microwaveprop.Workers.WeatherFetchWorker
@@ -38,8 +40,6 @@ defmodule Mix.Tasks.Weather.RebatchAsosTest do
   end
 
   defp pending_count_by_type do
-    import Ecto.Query
-
     from(j in Oban.Job,
       where: j.state in ["available", "scheduled", "retryable"],
       select: {fragment("?->>'fetch_type'", j.args), count(j.id)},
diff --git a/test/support/fixtures/accounts_fixtures.ex b/test/support/fixtures/accounts_fixtures.ex
index dc49d5e8..55b32b14 100644
--- a/test/support/fixtures/accounts_fixtures.ex
+++ b/test/support/fixtures/accounts_fixtures.ex
@@ -83,7 +83,8 @@ defmodule Microwaveprop.AccountsFixtures do
     )
   end
 
-  @spec offset_user_token(String.t(), integer(), :second | :minute | :hour | :day) :: {non_neg_integer(), nil | [term()]}
+  @spec offset_user_token(String.t(), integer(), :second | :minute | :hour | :day) ::
+          {non_neg_integer(), nil | [term()]}
   def offset_user_token(token, amount_to_add, unit) do
     dt = DateTime.add(DateTime.utc_now(:second), amount_to_add, unit)