diff --git a/SortedQueryTest.h5 b/SortedQueryTest.h5
new file mode 100644
index 000000000..67f3d7d6c
Binary files /dev/null and b/SortedQueryTest.h5 differ
diff --git a/tests/unit/test_query.py b/tests/unit/test_query.py
deleted file mode 100644
index 0646825d6..000000000
--- a/tests/unit/test_query.py
+++ /dev/null
@@ -1,161 +0,0 @@
-# import os
-# from abc import ABCMeta, abstractmethod
-#
-# import numpy as np
-# from h5py import File
-# from hdmf.array import SortedArray, LinSpace
-# from hdmf.query import HDMFDataset, Query
-# from hdmf.testing import TestCase
-#
-#
-# class AbstractQueryMixin(metaclass=ABCMeta):
-#
-#     @abstractmethod
-#     def getDataset(self):
-#         raise NotImplementedError('Cannot run test unless getDataset is implemented')
-#
-#     def setUp(self):
-#         self.dset = self.getDataset()
-#         self.wrapper = HDMFDataset(self.dset)
-#
-#     def test_get_dataset(self):
-#         array = self.wrapper.dataset
-#         self.assertIsInstance(array, SortedArray)
-#
-#     def test___gt__(self):
-#         '''
-#         Test wrapper greater than magic method
-#         '''
-#         q = self.wrapper > 5
-#         self.assertIsInstance(q, Query)
-#         result = q.evaluate()
-#         expected = [False, False, False, False, False,
-#                     False, True, True, True, True]
-#         expected = slice(6, 10)
-#         self.assertEqual(result, expected)
-#
-#     def test___ge__(self):
-#         '''
-#         Test wrapper greater than or equal magic method
-#         '''
-#         q = self.wrapper >= 5
-#         self.assertIsInstance(q, Query)
-#         result = q.evaluate()
-#         expected = [False, False, False, False, False,
-#                     True, True, True, True, True]
-#         expected = slice(5, 10)
-#         self.assertEqual(result, expected)
-#
-#     def test___lt__(self):
-#         '''
-#         Test wrapper less than magic method
-#         '''
-#         q = self.wrapper < 5
-#         self.assertIsInstance(q, Query)
-#         result = q.evaluate()
-#         expected = [True, True, True, True, True,
-#                     False, False, False, False, False]
-#         expected = slice(0, 5)
-#         self.assertEqual(result, expected)
-#
-#     def test___le__(self):
-#         '''
-#         Test wrapper less than or equal magic method
-#         '''
-#         q = self.wrapper <= 5
-#         self.assertIsInstance(q, Query)
-#         result = q.evaluate()
-#         expected = [True, True, True, True, True,
-#                     True, False, False, False, False]
-#         expected = slice(0, 6)
-#         self.assertEqual(result, expected)
-#
-#     def test___eq__(self):
-#         '''
-#         Test wrapper equals magic method
-#         '''
-#         q = self.wrapper == 5
-#         self.assertIsInstance(q, Query)
-#         result = q.evaluate()
-#         expected = [False, False, False, False, False,
-#                     True, False, False, False, False]
-#         expected = 5
-#         self.assertTrue(np.array_equal(result, expected))
-#
-#     def test___ne__(self):
-#         '''
-#         Test wrapper not equal magic method
-#         '''
-#         q = self.wrapper != 5
-#         self.assertIsInstance(q, Query)
-#         result = q.evaluate()
-#         expected = [True, True, True, True, True,
-#                     False, True, True, True, True]
-#         expected = [slice(0, 5), slice(6, 10)]
-#         self.assertTrue(np.array_equal(result, expected))
-#
-#     def test___getitem__(self):
-#         '''
-#         Test wrapper getitem using slice
-#         '''
-#         result = self.wrapper[0:5]
-#         expected = [0, 1, 2, 3, 4]
-#         self.assertTrue(np.array_equal(result, expected))
-#
-#     def test___getitem__query(self):
-#         '''
-#         Test wrapper getitem using query
-#         '''
-#         q = self.wrapper < 5
-#         result = self.wrapper[q]
-#         expected = [0, 1, 2, 3, 4]
-#         self.assertTrue(np.array_equal(result, expected))
-#
-#
-# class SortedQueryTest(AbstractQueryMixin, TestCase):
-#
-#     path = 'SortedQueryTest.h5'
-#
-#     def getDataset(self):
-#         self.f = File(self.path, 'w')
-#         self.input = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
-#         self.d = self.f.create_dataset('dset', data=self.input)
-#         return SortedArray(self.d)
-#
-#     def tearDown(self):
-#         self.f.close()
-#         if os.path.exists(self.path):
-#             os.remove(self.path)
-#
-#
-# class LinspaceQueryTest(AbstractQueryMixin, TestCase):
-#
-#     path = 'LinspaceQueryTest.h5'
-#
-#     def getDataset(self):
-#         return LinSpace(0, 10, 1)
-#
-#
-# class CompoundQueryTest(TestCase):
-#
-#     def getM(self):
-#         return SortedArray(np.arange(10, 20, 1))
-#
-#     def getN(self):
-#         return SortedArray(np.arange(10.0, 20.0, 0.5))
-#
-#     def setUp(self):
-#         self.m = HDMFDataset(self.getM())
-#         self.n = HDMFDataset(self.getN())
-#
-#     # TODO: test not completed
-#     # def test_map(self):
-#     #     q = self.m == (12, 16)                # IN operation
-#     #     q.evaluate()                          # [2,3,4,5]
-#     #     q.evaluate(False)                     # RangeResult(2,6)
-#     #     r = self.m[q]                         # noqa: F841
-#     #     r = self.m[q.evaluate()]              # noqa: F841
-#     #     r = self.m[q.evaluate(False)]         # noqa: F841
-#
-#     def tearDown(self):
-#         pass