diff --git a/tests/test_batch_fetch.py b/tests/test_batch_fetch.py
index 236c056..55c2411 100644
--- a/tests/test_batch_fetch.py
+++ b/tests/test_batch_fetch.py
@@ -112,3 +112,5 @@ class TestBatchFetch(TestCase):
         query_count = self.connection.query_count
         categories[0].articles[0].tags
         assert self.connection.query_count == query_count
+        categories[1].articles[1].tags
+        assert self.connection.query_count == query_count
diff --git a/tests/types/__init__.py b/tests/types/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_arrow.py b/tests/types/test_arrow.py
similarity index 100%
rename from tests/test_arrow.py
rename to tests/types/test_arrow.py
diff --git a/tests/test_color.py b/tests/types/test_color.py
similarity index 100%
rename from tests/test_color.py
rename to tests/types/test_color.py
diff --git a/tests/test_email.py b/tests/types/test_email.py
similarity index 100%
rename from tests/test_email.py
rename to tests/types/test_email.py
diff --git a/tests/test_ip_address.py b/tests/types/test_ip_address.py
similarity index 100%
rename from tests/test_ip_address.py
rename to tests/types/test_ip_address.py
diff --git a/tests/test_number_range.py b/tests/types/test_number_range.py
similarity index 100%
rename from tests/test_number_range.py
rename to tests/types/test_number_range.py
diff --git a/tests/test_password.py b/tests/types/test_password.py
similarity index 100%
rename from tests/test_password.py
rename to tests/types/test_password.py
diff --git a/tests/test_phonenumber_type.py b/tests/types/test_phonenumber.py
similarity index 100%
rename from tests/test_phonenumber_type.py
rename to tests/types/test_phonenumber.py
diff --git a/tests/test_scalar_list.py b/tests/types/test_scalar_list.py
similarity index 100%
rename from tests/test_scalar_list.py
rename to tests/types/test_scalar_list.py
diff --git a/tests/test_timezone.py b/tests/types/test_timezone.py
similarity index 100%
rename from tests/test_timezone.py
rename to tests/types/test_timezone.py
diff --git a/tests/test_tsvector_type.py b/tests/types/test_tsvector.py
similarity index 100%
rename from tests/test_tsvector_type.py
rename to tests/types/test_tsvector.py
diff --git a/tests/test_uuid.py b/tests/types/test_uuid.py
similarity index 100%
rename from tests/test_uuid.py
rename to tests/types/test_uuid.py