diff --git a/python-ifirma/__init__.py b/python_ifirma/__init__.py
similarity index 100%
rename from python-ifirma/__init__.py
rename to python_ifirma/__init__.py
diff --git a/python-ifirma/ifirma.py b/python_ifirma/ifirma.py
similarity index 100%
rename from python-ifirma/ifirma.py
rename to python_ifirma/ifirma.py
diff --git a/python-ifirma/tests.py b/python_ifirma/tests.py
similarity index 64%
rename from python-ifirma/tests.py
rename to python_ifirma/tests.py
index 2b6b516..8d1b683 100644
--- a/python-ifirma/tests.py
+++ b/python_ifirma/tests.py
@@ -1,6 +1,6 @@
 from unittest.case import TestCase
 
-from ifirma import Client
+from python_ifirma.ifirma import Client
 
 
 class TestClient(TestCase):
@@ -16,6 +16,17 @@ class TestClient(TestCase):
             "Warszawa"
         )
 
+    def __create_power_client(self):
+        self.client = Client(
+            "name",
+            "street",
+            "00-001",
+            "Polska",
+            "Warszawa",
+            email="email@server.com"
+        )
+
+
     def testClient(self):
         self.__create_basic_client()
         get_dict = self.client.get_dict()
@@ -30,6 +41,10 @@ class TestClient(TestCase):
         self.assertIn("Telefon", get_dict)
         self.assertIn("OsobaFizyczna", get_dict)
 
-    def testEmail(self):
+    def testEmailUnSet(self):
         self.__create_basic_client()
-        self.assertIsNone(self.client.get_dict()["Email"])
\ No newline at end of file
+        self.assertIsNone(self.client.get_dict()["Email"])
+
+    def testEmailSet(self):
+        self.__create_power_client()
+        self.assertIsNotNone(self.client.get_dict()["Email"])
\ No newline at end of file