diff --git a/assemblyline/filestore/transport/azure.py b/assemblyline/filestore/transport/azure.py
index 64941e6ac..03b9dec11 100644
--- a/assemblyline/filestore/transport/azure.py
+++ b/assemblyline/filestore/transport/azure.py
@@ -161,7 +161,6 @@ def put(self, dst_path, content):
             except ResourceExistsError:
                 pass
 
-# TODO: Create an extension of the base class TransportFile
 
 class TransportReadStreamAzure(TransportReadStream):
     def __init__(self, streamFile):
@@ -171,4 +170,4 @@ def close(self):
         pass
 
     def read(self, chunk_size=-1):
-        return next(self.file)
\ No newline at end of file
+        return next(self.file)
diff --git a/test/docker-compose.yml b/test/docker-compose.yml
index d502fe0d4..e5133792b 100644
--- a/test/docker-compose.yml
+++ b/test/docker-compose.yml
@@ -33,4 +33,10 @@ services:
     ports:
       - '21:21'
       - '20:20'
-      - '21100-21110:21100-21110'
\ No newline at end of file
+      - '21100-21110:21100-21110'
+
+  sftpServer:
+    image: atmoz/sftp
+    ports:
+      - '2222:22'
+    command: sftp_test_user:password:1001::test
diff --git a/test/test_filestore.py b/test/test_filestore.py
index 30719d97c..337c2bd04 100644
--- a/test/test_filestore.py
+++ b/test/test_filestore.py
@@ -33,6 +33,7 @@ def test_http():
     httpObject = fs.read('assemblyline')
     assert httpObject.read(chunk_size=32) is not None
 
+
 def test_https():
     """
     Test HTTPS FileStore by fetching the assemblyline page on
@@ -53,22 +54,28 @@ def test_https():
 #     Rebex test server.
 #     """
 #     fs = FileStore('sftp://demo:password@test.rebex.net')
+#     # fs = FileStore('sftp://sftp_test_user:password@localhost:2222')
+#     # fs.upload('readme.txt', 'readme.txt')
 #     assert fs.exists('readme.txt') != []
 #     assert fs.get('readme.txt') is not None
+#     sftpfile = fs.read('readme.txt')
+#     assert sftpfile.read() is not None
 
 
 def test_ftp():
     """
     Test FTP FileStore by fetching the readme.txt file from
-    Rebex test server.
+    containerized server.
     """
     fs = FileStore('ftp://al_test_user:password@localhost')
-
+    fs.upload('readme.txt', 'readme.txt')
     # fs = FileStore('ftp://demo:password@test.rebex.net')
     assert fs.exists('readme.txt') != []
     assert fs.get('readme.txt') is not None
     ftpfile = fs.read('readme.txt')
     assert ftpfile.read() is not None
+    fs.delete('readme.txt')
+    assert fs.exists('readme.txt') == []
 
 
 # def test_ftps():
@@ -79,6 +86,8 @@ def test_ftp():
 #     fs = FileStore('ftps://demo:password@test.rebex.net')
 #     assert fs.exists('readme.txt') != []
 #     assert fs.get('readme.txt') is not None
+#     ftpsfile = fs.read('readme.txt')
+#     assert ftpsfile.read() is not None
 
 
 def test_file():