diff --git a/tests/test_GOES.py b/tests/test_GOES.py
index 6b63eba..486e95c 100644
--- a/tests/test_GOES.py
+++ b/tests/test_GOES.py
@@ -1,28 +1,45 @@
 from goes2go import GOES
 
 
-def test_GOES():
+########################################################################
+
+
+def test_GOES16():
     """Create a GOES object"""
     G = GOES(satellite="noaa-goes16", domain="C")
     assert G.satellite == "noaa-goes16"
     assert G.domain == "C"
 
 
-def test_GOES_latest():
-    G = GOES()
-    ds = G.latest()
+def test_GOES16_latest():
+    ds = GOES(satellite=16).latest()
+
+
+def test_GOES16_nearesttime():
+    ds = GOES(satellite=16).nearesttime("2022-01-01")
+
+
+def test_GOES16_timerange():
+    ds = GOES(satellite=16).timerange("2022-01-01 00:00", "2022-01-01 01:00")
 
 
-def test_GOES_nearesttime():
-    G = GOES()
-    ds = G.nearesttime("2022-01-01")
+def test_GOES16_df():
+    df = GOES(satellite=16).df("2022-01-01 00:00", "2022-01-01 01:00")
+
+
+########################################################################
+
+
+def test_GOES18():
+    """Create a GOES object"""
+    G = GOES(satellite="noaa-goes18", domain="C")
+    assert G.satellite == "noaa-goes18"
+    assert G.domain == "C"
 
 
-def test_GOES_timerange():
-    G = GOES()
-    ds = G.timerange("2022-01-01 00:00", "2022-01-01 01:00")
+def test_GOES18_latest():
+    ds = GOES(satellite=18).latest()
 
 
-def test_GOES_df():
-    G = GOES()
-    df = G.df("2022-01-01 00:00", "2022-01-01 01:00")
+def test_GOES18_nearesttime():
+    ds = GOES(satellite=18).nearesttime("2023-07-01")