diff --git a/tests/api/test_picking.py b/tests/api/test_picking.py
index 4b4f57f..012b804 100644
--- a/tests/api/test_picking.py
+++ b/tests/api/test_picking.py
@@ -10,21 +10,21 @@
 import pytest
 from fgpyo.sequence import reverse_complement
 
+from prymer.api import FilteringParams
+from prymer.api import MinOptMax
+from prymer.api import Primer
+from prymer.api import PrimerPair
+from prymer.api import Span
+from prymer.api import Strand
+from prymer.api import build_and_pick_primer_pairs
+from prymer.api import build_primer_pairs
+from prymer.api import pick_top_primer_pairs
 from prymer.api.melting import calculate_long_seq_tm
-from prymer.api.minoptmax import MinOptMax
-from prymer.api.picking import FilteringParams
 from prymer.api.picking import _dist_penalty
 from prymer.api.picking import _seq_penalty
-from prymer.api.picking import build_and_pick_primer_pairs
-from prymer.api.picking import build_primer_pairs
 from prymer.api.picking import check_primer_overlap
 from prymer.api.picking import is_acceptable_primer_pair
-from prymer.api.picking import pick_top_primer_pairs
 from prymer.api.picking import score as picking_score
-from prymer.api.primer import Primer
-from prymer.api.primer_pair import PrimerPair
-from prymer.api.span import Span
-from prymer.api.span import Strand
 from prymer.ntthal import NtThermoAlign
 from prymer.offtarget import OffTargetDetector
 
diff --git a/tests/offtarget/test_offtarget.py b/tests/offtarget/test_offtarget.py
index 7da5ac7..aabd2c2 100644
--- a/tests/offtarget/test_offtarget.py
+++ b/tests/offtarget/test_offtarget.py
@@ -4,14 +4,14 @@
 import pytest
 from fgpyo.sam import Cigar
 
-from prymer.api.primer import Primer
-from prymer.api.primer_pair import PrimerPair
-from prymer.api.span import Span
-from prymer.api.span import Strand
+from prymer.api import Primer
+from prymer.api import PrimerPair
+from prymer.api import Span
+from prymer.api import Strand
+from prymer.offtarget import BwaHit
+from prymer.offtarget import BwaResult
 from prymer.offtarget import OffTargetDetector
 from prymer.offtarget import OffTargetResult
-from prymer.offtarget.bwa import BwaHit
-from prymer.offtarget.bwa import BwaResult
 
 
 def _build_detector(