diff --git a/src/hdmf/term_set.py b/src/hdmf/term_set.py
index 12960d970..246d463b0 100644
--- a/src/hdmf/term_set.py
+++ b/src/hdmf/term_set.py
@@ -197,7 +197,7 @@ def __init__(self, **kwargs):
     def __validate(self):
         # check if list, tuple, array, Data
         from .container import Data # circular import fix
-        if isinstance(self.__value, (list, np.ndarray, tuple, Data)): # TODO: Future ticket on DataIO support
+        if isinstance(self.__value, (list, np.ndarray, tuple)): # TODO: Future ticket on DataIO support
             values = self.__value
         # create list if none of those
         else:
@@ -228,13 +228,14 @@ def field_name(self):
     def dtype(self):
         return self.__getattr__('dtype')
 
-    def __getattr__(self, val):
-        """
-        This method is to get attributes that are not defined in init.
-        This is when dealing with data and numpy arrays.
-        """
-        if val in ('data', 'shape', 'dtype'):
-            return getattr(self.__value, val)
+    # TODO: Probably useful when dealing with DATAIO (Future)
+    # def __getattr__(self, val):
+    #     """
+    #     This method is to get attributes that are not defined in init.
+    #     This is when dealing with data and numpy arrays.
+    #     """
+    #     if val in ('data', 'shape', 'dtype'):
+    #         return getattr(self.__value, val)
 
     def __getitem__(self, val):
         """
diff --git a/tests/unit/test_term_set.py b/tests/unit/test_term_set.py
index 3d1f065e3..476fb49a9 100644
--- a/tests/unit/test_term_set.py
+++ b/tests/unit/test_term_set.py
@@ -158,7 +158,7 @@ def test_validate_error(self):
     def test_wrapper_validate_attribute(self):
         pass
 
-    def test_wrapper_validate_attribute_error(self):
+    def test_wrapper_validate_dataset(self):
         pass
 
     def test_wrapper_append(self):