diff --git a/shared/datastore/tests/unit/get_image_test.py b/shared/datastore/tests/unit/get_image_test.py
new file mode 100644
index 0000000..4322838
--- /dev/null
+++ b/shared/datastore/tests/unit/get_image_test.py
@@ -0,0 +1,62 @@
+# """Definition of unittests for get_image function."""
+
+# import os
+# import unittest
+# from unittest.mock import Mock
+# from minio import Minio
+# import random
+# import string
+# from PIL import Image
+# from io import BytesIO
+
+# from shared.datastore import get_image
+
+
+# class TestGetImage(unittest.TestCase):
+
+#     def setUp(self):
+#         # mock minio client
+#         self.client = Mock(spec=Minio)
+#         # mock response object
+#         image = Image.new(mode='RGB', size=(480,480))
+#         buffer = BytesIO()
+#         image.save(buffer, 'png')
+#         self.client.get_object.return_value.data = buffer.getvalue()
+#         # set object name
+#         self.object_name = ''.join(
+#             random.choices(
+#                 string.ascii_uppercase + string.digits,
+#                 k=24
+#             )
+#         )
+#         # populate env
+#         self.env_var_map = {
+#             'MINIO_BUCKET_NAME': 'test-bucket'
+#         }
+#         for key, val in self.env_var_map.items():
+#             os.environ[key] = val
+
+#     def tearDown(self):
+#         # clean env
+#         for key in self.env_var_map:
+#             _ = os.environ.pop(key, default=None)
+
+#     def test_should_fail_when_env_not_set(self):
+#         # ensure env not set
+#         self.tearDown()
+#         # run test
+#         with self.assertRaises(AssertionError):
+#             get_image(
+#                 client=self.client,
+#                 object_name=self.object_name
+#             )
+
+#     def test_should_call_client__get_object(self):
+#         get_image(
+#             client=self.client,
+#             object_name=self.object_name,
+#         )
+#         self.client.get_object.assert_called_with(
+#             bucket_name=self.env_var_map['MINIO_BUCKET_NAME'],
+#             object_name=f'images/{self.object_name}',
+#         )
diff --git a/shared/datastore/tests/unit/get_model_test.py b/shared/datastore/tests/unit/get_model_test.py
new file mode 100644
index 0000000..c2c132f
--- /dev/null
+++ b/shared/datastore/tests/unit/get_model_test.py
@@ -0,0 +1,62 @@
+# """Definition of unittest for get_model function."""
+
+# import os
+# import unittest
+# from unittest.mock import Mock
+# from minio import Minio
+# import random
+# import string
+
+# from io import BytesIO
+
+# from shared.datastore import get_model
+
+
+# class TestGetModel(unittest.TestCase):
+
+#     def setUp(self):
+#         # mock minio client
+#         self.client = Mock(spec=Minio)
+#         # mock response object
+#         image = Image.new(mode='RGB', size=(480,480))
+#         buffer = BytesIO()
+#         image.save(buffer, 'png')
+#         self.client.get_object.return_value.data = buffer.getvalue()
+#         # set object name
+#         self.object_name = ''.join(
+#             random.choices(
+#                 string.ascii_uppercase + string.digits,
+#                 k=24
+#             )
+#         )
+#         # populate env
+#         self.env_var_map = {
+#             'MINIO_BUCKET_NAME': 'test-bucket'
+#         }
+#         for key, val in self.env_var_map.items():
+#             os.environ[key] = val
+
+#     def tearDown(self):
+#         # clean env
+#         for key in self.env_var_map:
+#             _ = os.environ.pop(key, default=None)
+
+#     def test_should_fail_when_env_not_set(self):
+#         # ensure env not set
+#         self.tearDown()
+#         # run test
+#         with self.assertRaises(AssertionError):
+#             get_image(
+#                 client=self.client,
+#                 object_name=self.object_name
+#             )
+
+#     def test_should_call_client__get_object(self):
+#         get_image(
+#             client=self.client,
+#             object_name=self.object_name,
+#         )
+#         self.client.get_object.assert_called_with(
+#             bucket_name=self.env_var_map['MINIO_BUCKET_NAME'],
+#             object_name=f'images/{self.object_name}',
+#         )