diff --git a/src/SingleModuleTesting/broadcastClient.py b/mainCode/SingleModuleTesting/broadcastClient.py
similarity index 100%
rename from src/SingleModuleTesting/broadcastClient.py
rename to mainCode/SingleModuleTesting/broadcastClient.py
diff --git a/src/SingleModuleTesting/broadcastServer.py b/mainCode/SingleModuleTesting/broadcastServer.py
similarity index 100%
rename from src/SingleModuleTesting/broadcastServer.py
rename to mainCode/SingleModuleTesting/broadcastServer.py
diff --git a/mainCode/__init__.py b/mainCode/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/enlight.code-workspace b/mainCode/enlight.code-workspace
similarity index 100%
rename from src/enlight.code-workspace
rename to mainCode/enlight.code-workspace
diff --git a/src/session.py b/mainCode/session.py
similarity index 98%
rename from src/session.py
rename to mainCode/session.py
index a717130..c119857 100644
--- a/src/session.py
+++ b/mainCode/session.py
@@ -6,7 +6,7 @@ logging.basicConfig(level=logging.DEBUG, format='%(asctime)s:%(levelname)s:%(thr
 
 USED_SESSION_IDS = []
 
-VERSION = "1.1.1"
+VERSION = "1.1.2"
 
 ## Role defs
 HOST = 0
@@ -80,9 +80,8 @@ class enlightSession():
                 self.sessionId = get_random_alphanumeric_string(24)
             logging.info("My session id is " + self.sessionId)
             USED_SESSION_IDS.append(self.sessionId)
-            self.__server__ = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)#, socket.IPPROTO_UDP)
+            self.__server__ = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
             self.__server__.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1)
-            ### self.__server__.bind(("", 37020))   # Bind it to a random port # 37020
             self.__activ__ = True
             self.allowJoin = True
             logging.info("Starting server thread")
diff --git a/src/testClient.py b/mainCode/testClient.py
similarity index 100%
rename from src/testClient.py
rename to mainCode/testClient.py
diff --git a/testing/sessionDiscoveryTesting.py b/testing/sessionDiscoveryTesting.py
index 9cf9030..b3b4b74 100644
--- a/testing/sessionDiscoveryTesting.py
+++ b/testing/sessionDiscoveryTesting.py
@@ -1,10 +1,31 @@
-from src import session
+import sys
+sys.path.append('mainCode/../')
+import mainCode.session
 import unittest
+import time
 
 
-class NamesTestCase(unittest.TestCase):
+class SessionTesting(unittest.TestCase):
 
-   def test_first_last_name(self):
-       testSession = session.enlightSession("TestSession", role = session.HOST)
-       testSession.initConnection()
-       self.assertEqual(testSession.getSessionMembers(), [])
\ No newline at end of file
+    def setUp(self):
+        self.testSession = mainCode.session.enlightSession("TestSession", role = mainCode.session.HOST)
+        self.testSession.initConnection()
+
+    def test_check_if_members_are_empty(self):
+        time.sleep(1)
+        members = self.testSession.getSessionMembers()
+        self.assertEqual(members, [])
+    
+    def test_if_allow_join_is_okay(self):
+        time.sleep(2)
+        self.assertEqual(self.testSession.allowJoin, True)
+
+    def test_if_var_and_func_return_same(self):
+        time.sleep(3)
+        self.assertEqual(self.testSession.sessionId, self.testSession.getSessionId())
+    
+    def tearDown(self):
+        self.testSession.stopSession()
+
+if __name__ == '__main__':
+   unittest.main()