diff --git a/tests/test_books_loader.py b/tests/test_books_loader.py
index 02cb5ee94ecedc99481e2848a2a4d6a45e7fc7c0..faf19e02cb6b8004d20e2017163f20d754284018 100644
--- a/tests/test_books_loader.py
+++ b/tests/test_books_loader.py
@@ -32,48 +32,42 @@ books_path = testutil.test_path('books')
 def conservancy_loader():
     return books.Loader(books_path, books.FiscalYear(3))
 
-def include_patterns(years, subdir='..'):
-    for year in years:
-        path = Path(subdir, f'{year}.beancount')
-        yield rf'^include "{re.escape(str(path))}"$'
-
-@pytest.mark.parametrize('range_start,range_stop,expect_years', [
-    (2019, 2020, [2019, 2020]),
-    (-1, 2020, [2019, 2020]),
-    (10, 2019, [2019, 2020]),
-    (-10, 2019, [2018, 2019]),
-    (date(2019, 1, 1), date(2020, 6, 1), [2018, 2019, 2020]),
-    (-1, date(2020, 2, 1), [2018, 2019]),
+@pytest.mark.parametrize('from_fy,to_fy,expect_years', [
+    (2019, 2019, range(2019, 2020)),
+    (0, 2019, range(2019, 2020)),
+    (2018, 2019, range(2018, 2020)),
+    (1, 2018, range(2018, 2020)),
+    (-1, 2019, range(2018, 2020)),
+    (2019, 2020, range(2019, 2021)),
+    (1, 2019, range(2019, 2021)),
+    (-1, 2020, range(2019, 2021)),
+    (2010, 2030, range(2018, 2021)),
+    (20, 2010, range(2018, 2021)),
+    (-20, 2030, range(2018, 2021)),
 ])
-def test_fy_range_string(conservancy_loader, range_start, range_stop, expect_years):
-    actual = conservancy_loader.fy_range_string(range_start, range_stop)
-    testutil.check_lines_match(actual.splitlines(), [
-        rf'^option "title" "Books from {expect_years[0]}"$',
-        rf'^plugin "beancount\.plugins\.auto"$',
-        *include_patterns(expect_years),
-    ])
-
-@pytest.mark.parametrize('year_offset', range(-3, 1))
-def test_fy_range_string_with_offset(conservancy_loader, year_offset):
-    base_year = 2020
-    start_year = max(2018, base_year + year_offset)
-    expect_years = range(start_year, base_year + 1)
-    actual = conservancy_loader.fy_range_string(year_offset, base_year)
-    testutil.check_lines_match(actual.splitlines(), include_patterns(expect_years))
-
-def test_fy_range_string_empty_range(conservancy_loader):
-    assert conservancy_loader.fy_range_string(2020, 2019) == ''
-
-def test_load_fy_range(conservancy_loader):
-    entries, errors, options_map = conservancy_loader.load_fy_range(2018, 2019)
+def test_load_fy_range(conservancy_loader, from_fy, to_fy, expect_years):
+    entries, errors, options_map = conservancy_loader.load_fy_range(from_fy, to_fy)
     assert not errors
     narrations = {getattr(entry, 'narration', None) for entry in entries}
-    assert '2018 donation' in narrations
-    assert '2019 donation' in narrations
-    assert '2020 donation' not in narrations
+    assert ('2018 donation' in narrations) == (2018 in expect_years)
+    assert ('2019 donation' in narrations) == (2019 in expect_years)
+    assert ('2020 donation' in narrations) == (2020 in expect_years)
+
+def test_load_fy_range_does_not_duplicate_openings(conservancy_loader):
+    entries, errors, options_map = conservancy_loader.load_fy_range(2010, 2030)
+    openings = []
+    open_accounts = set()
+    for entry in entries:
+        try:
+            open_accounts.add(entry.account)
+        except AttributeError:
+            pass
+        else:
+            openings.append(entry)
+    assert len(openings) == len(open_accounts)
 
 def test_load_fy_range_empty(conservancy_loader):
     entries, errors, options_map = conservancy_loader.load_fy_range(2020, 2019)
     assert not errors
     assert not entries
-    assert options_map.get('input_hash') == hashlib.md5().hexdigest()
+    assert not options_map