diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3d2df70..6f91104 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1266,7 +1266,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="119">
           <caret line="10" column="11" lean-forward="false" selection-start-line="10" selection-start-column="11" selection-end-line="10" selection-end-column="11" />
-        </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/persistence/src/test/java/cz/fi/muni/pa165/dao/UserDaoTest.java">
@@ -1291,22 +1290,20 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="136">
           <caret line="12" column="40" lean-forward="false" selection-start-line="12" selection-start-column="40" selection-end-line="12" selection-end-column="40" />
-          <folding />
+          <folding>
+            <marker date="1509132598530" expanded="false" signature="429:435" ph=" }" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/dao/SportDaoImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="136">
-          <caret line="11" column="64" lean-forward="false" selection-start-line="11" selection-start-column="64" selection-end-line="11" selection-end-column="64" />
-          <folding>
-            <element signature="e#312#313#0" expanded="true" />
+    <entry file="file://$PROJECT_DIR$/persistence/src/main/java/cz/fi/muni/pa165/dao/UserDao.java">
+          <folding />
+        </state>
             <element signature="e#368#369#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/persistence/src/test/java/cz/fi/muni/pa165/dao/SportDaoImplTest.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="68">
           <caret line="4" column="1" lean-forward="true" selection-start-line="4" selection-start-column="1" selection-end-line="4" selection-end-column="1" />
diff --git a/persistence/src/test/java/cz/fi/muni/pa165/dao/SportsMenDaoImplTest.java b/persistence/src/test/java/cz/fi/muni/pa165/dao/SportsMenDaoImplTest.java
index af54e0b..ecbc389 100644
--- a/persistence/src/test/java/cz/fi/muni/pa165/dao/SportsMenDaoImplTest.java
+++ b/persistence/src/test/java/cz/fi/muni/pa165/dao/SportsMenDaoImplTest.java
@@ -5,7 +5,6 @@
 import cz.fi.muni.pa165.enums.Gendre;
 import cz.fi.muni.pa165.enums.Role;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
@@ -13,8 +12,7 @@
 import java.util.List;
 import java.util.Set;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.*;
 
 /**
  * @author Martin Šmíd
@@ -22,7 +20,7 @@
 public class SportsMenDaoImplTest extends BaseDaoImplTest {
 
     @Autowired
-    private SportsMenDao sportsMenDao;
+    SportsMenDao sportsMenDao;
 
     @Autowired
     private CompetitionDao competitionDao;
@@ -49,6 +47,7 @@ public void testCreate() {
 
         User found = sportsMenDao.findById(sportsmen.getId());
         assertNotNull(found);
+        assertEquals(sportsMenDao.findAll().size(), 1);
         assertEquals(found, sportsmen);
     }
 
@@ -63,9 +62,9 @@ public void testAddToCompetition() {
         Competition foundCompetition = competitionDao.findById(competition.getId());
         Set<User> sportsmenInComp = foundCompetition.getSportsMen();
 
-        Assert.assertTrue(sportsmen.getCompetitions().contains(competition));
-        Assert.assertEquals(sportsmenInComp.size(), 1);
-        Assert.assertTrue(sportsmenInComp.contains(sportsmen));
+        assertTrue(sportsmen.getCompetitions().contains(competition));
+        assertEquals(sportsmenInComp.size(), 1);
+        assertTrue(sportsmenInComp.contains(sportsmen));
     }
 
     @Test
@@ -78,32 +77,20 @@ public void testRemoveFromCompetition() {
         sportsMenDao.create(sportsmen);
 
         sportsMenDao.removeFromCompetition(competition, sportsmen);
-        Assert.assertEquals(sportsMenDao.findById(sportsmen.getId()).getCompetitions().size(), 0);
+        assertEquals(sportsMenDao.findById(sportsmen.getId()).getCompetitions().size(), 0);
 
         sportsMenDao.addToCompetition(competition, sportsmen);
         sportsMenDao.addToCompetition(competition1, sportsmen);
         sportsMenDao.removeFromCompetition(competition, sportsmen);
 
-        Competition found = competitionDao.findById(competition.getId());
-        Assert.assertNull(found);
-        Assert.assertEquals(sportsmen.getCompetitions().size(), 1);
-        found = competitionDao.findById(competition1.getId());
-        Assert.assertNotNull(found);
+        assertEquals(sportsmen.getCompetitions().size(), 1);
+        Competition found = competitionDao.findById(competition1.getId());
+        
         Set<User> sportsmenInComp = found.getSportsMen();
 
-        Assert.assertTrue(sportsmen.getCompetitions().contains(competition));
-        Assert.assertEquals(sportsmenInComp.size(), 1);
-        Assert.assertTrue(sportsmenInComp.contains(sportsmen));
-    }
-
-    @Test
-    public void testAddToTeam() {
-
-    }
-
-    @Test
-    public void testRemoveFromTeam() {
-
+        assertTrue(sportsmen.getCompetitions().contains(competition1));
+        assertEquals(sportsmenInComp.size(), 1);
+        assertTrue(sportsmenInComp.contains(sportsmen));
     }
 
     @Test