diff --git a/tests/test_util.py b/tests/test_util.py
index 33f8f6b..481ffdb 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -11,7 +11,27 @@ def test_convert_string_to_integer() -> None:
         uc.convert_string_to_integer("a")
 
 
-def test_get_next_draw_date() -> None:
+def test_get_next_draw_date_none() -> None:
+    assert not ud.get_next_draw_date(game=None)
+
+
+def test_get_next_draw_date_minimum() -> None:
+    assert ud.get_next_draw_date(game="megamillions")
+    assert ud.get_next_draw_date(game="powerball")
+    assert not ud.get_next_draw_date(game="something")
+
+
+def test_get_next_draw_date_specified_from_date() -> None:
     assert ud.get_next_draw_date(game="megamillions", from_date='02/15/2026') == '02/17/2026'
+    assert ud.get_next_draw_date(game="megamillions", from_date='02/16/2026') == '02/17/2026'
+    assert ud.get_next_draw_date(game="megamillions", from_date='02/17/2026') == '02/17/2026'
+    assert ud.get_next_draw_date(game="megamillions", from_date='02/18/2026') == '02/20/2026'
+    assert ud.get_next_draw_date(game="megamillions", from_date='02/19/2026') == '02/20/2026'
+
     assert ud.get_next_draw_date(game='powerball', from_date='02/15/2026') == '02/16/2026'
     assert ud.get_next_draw_date(game='powerball', from_date='02/16/2026') == '02/16/2026'
+    assert ud.get_next_draw_date(game='powerball', from_date='02/17/2026') == '02/18/2026'
+    assert ud.get_next_draw_date(game='powerball', from_date='02/18/2026') == '02/18/2026'
+    assert ud.get_next_draw_date(game='powerball', from_date='02/19/2026') == '02/21/2026'
+    assert ud.get_next_draw_date(game='powerball', from_date='02/20/2026') == '02/21/2026'
+