diff --git a/src/File/FileServer.py b/src/File/FileServer.py
index a6800f8f..68be3a4b 100644
--- a/src/File/FileServer.py
+++ b/src/File/FileServer.py
@@ -65,7 +65,7 @@ class FileServer(ConnectionServer):
 
         self.port_opened = {}
 
-        self.sites = {}
+        self.sites = self.site_manager.sites
         self.last_request = time.time()
         self.files_parsing = {}
         self.ui_server = None
diff --git a/src/Test/TestFileRequest.py b/src/Test/TestFileRequest.py
index 6a8d634a..3fabc271 100644
--- a/src/Test/TestFileRequest.py
+++ b/src/Test/TestFileRequest.py
@@ -91,7 +91,7 @@ class TestFileRequest:
     def testPex(self, file_server, site, site_temp):
         file_server.sites[site.address] = site
         client = FileServer(file_server.ip, 1545)
-        client.sites[site_temp.address] = site_temp
+        client.sites = {site_temp.address: site_temp}
         site_temp.connection_server = client
         connection = client.getConnection(file_server.ip, 1544)
 
diff --git a/src/Test/TestPeer.py b/src/Test/TestPeer.py
index f7bdb6da..f57e046e 100644
--- a/src/Test/TestPeer.py
+++ b/src/Test/TestPeer.py
@@ -15,7 +15,7 @@ class TestPeer:
     def testPing(self, file_server, site, site_temp):
         file_server.sites[site.address] = site
         client = FileServer(file_server.ip, 1545)
-        client.sites[site_temp.address] = site_temp
+        client.sites = {site_temp.address: site_temp}
         site_temp.connection_server = client
         connection = client.getConnection(file_server.ip, 1544)
 
@@ -34,7 +34,7 @@ class TestPeer:
     def testDownloadFile(self, file_server, site, site_temp):
         file_server.sites[site.address] = site
         client = FileServer(file_server.ip, 1545)
-        client.sites[site_temp.address] = site_temp
+        client.sites = {site_temp.address: site_temp}
         site_temp.connection_server = client
         connection = client.getConnection(file_server.ip, 1544)
 
@@ -129,7 +129,7 @@ class TestPeer:
     def testFindHash(self, file_server, site, site_temp):
         file_server.sites[site.address] = site
         client = FileServer(file_server.ip, 1545)
-        client.sites[site_temp.address] = site_temp
+        client.sites = {site_temp.address: site_temp}
         site_temp.connection_server = client
 
         # Add file_server as peer to client
diff --git a/src/Test/TestSiteDownload.py b/src/Test/TestSiteDownload.py
index 0d260128..34783238 100644
--- a/src/Test/TestSiteDownload.py
+++ b/src/Test/TestSiteDownload.py
@@ -26,7 +26,7 @@ class TestSiteDownload:
 
         # Init client server
         client = FileServer(file_server.ip, 1545)
-        client.sites[site_temp.address] = site_temp
+        client.sites = {site_temp.address: site_temp}
         site_temp.connection_server = client
         site_temp.announce = mock.MagicMock(return_value=True)  # Don't try to find peers from the net
 
@@ -35,6 +35,8 @@ class TestSiteDownload:
 
         site_temp.download(blind_includes=True).join(timeout=5)
 
+        assert site_temp.storage.isFile("content.json")
+
         # Rename non-optional file
         os.rename(site.storage.getPath("data/img/domain.png"), site.storage.getPath("data/img/domain-new.png"))
 
@@ -75,7 +77,7 @@ class TestSiteDownload:
 
         # Init client server
         client = FileServer(file_server.ip, 1545)
-        client.sites[site_temp.address] = site_temp
+        client.sites = {site_temp.address: site_temp}
         site_temp.connection_server = client
         site_temp.announce = mock.MagicMock(return_value=True)  # Don't try to find peers from the net
 
@@ -131,7 +133,7 @@ class TestSiteDownload:
 
         # Init client server
         client = FileServer(file_server.ip, 1545)
-        client.sites[site_temp.address] = site_temp
+        client.sites = {site_temp.address: site_temp}
         site_temp.connection_server = client
 
         # Download normally
@@ -179,7 +181,7 @@ class TestSiteDownload:
 
         # Init client server
         client = FileServer(file_server.ip, 1545)
-        client.sites[site_temp.address] = site_temp
+        client.sites = {site_temp.address: site_temp}
         site_temp.connection_server = client
 
         # Download normally
@@ -343,7 +345,7 @@ class TestSiteDownload:
 
         # Init client server
         client = FileServer(file_server.ip, 1545)
-        client.sites[site_temp.address] = site_temp
+        client.sites = {site_temp.address: site_temp}
         site_temp.connection_server = client
 
         # Don't try to find peers from the net
@@ -419,7 +421,7 @@ class TestSiteDownload:
 
         # Init client server
         client = FileServer(file_server.ip, 1545)
-        client.sites[site_temp.address] = site_temp
+        client.sites = {site_temp.address: site_temp}
         site_temp.connection_server = client
 
         # Connect peers
@@ -470,7 +472,7 @@ class TestSiteDownload:
 
         # Init client server
         client = FileServer(file_server.ip, 1545)
-        client.sites[site_temp.address] = site_temp
+        client.sites = {site_temp.address: site_temp}
         site_temp.connection_server = client
 
         # Connect peers
@@ -517,7 +519,7 @@ class TestSiteDownload:
 
         # Init client server
         client = FileServer(file_server.ip, 1545)
-        client.sites[site_temp.address] = site_temp
+        client.sites = {site_temp.address: site_temp}
         site_temp.connection_server = client
         site_temp.announce = mock.MagicMock(return_value=True)  # Don't try to find peers from the net
 
diff --git a/src/Test/TestTor.py b/src/Test/TestTor.py
index 63ff47f9..0252d73a 100644
--- a/src/Test/TestTor.py
+++ b/src/Test/TestTor.py
@@ -117,7 +117,7 @@ class TestTor:
         file_server.tor_manager = tor_manager
 
         client = FileServer(file_server.ip, 1545)
-        client.sites[site_temp.address] = site_temp
+        client.sites = {site_temp.address: site_temp}
         site_temp.connection_server = client
 
         # Add file_server as peer to client