diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/group/Group.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/group/Group.java
index 51dc151a1d66de2e7fd9dc6f254ca3e2b1f6e0f4..346ccd7fb82b696d451775fedcb542fa0f34b758 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/group/Group.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/group/Group.java
@@ -57,8 +57,8 @@ public class Group {
 
 
     @OneToMany(cascade = {CascadeType.ALL},
-            fetch = FetchType.LAZY, mappedBy = "group"
-            , orphanRemoval = true
+            fetch = FetchType.LAZY, mappedBy = "group",
+            orphanRemoval = true
     )
     @JsonIgnoreProperties("group")
     private List<UserGroupAsso> user = new ArrayList<>();
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/user/User.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/user/User.java
index a3cb4f8fc03861c3f91883853c4ea4ff9bbc6db9..88646b274072e7a2e84dc070d701c2ee662d9e3d 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/user/User.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/user/User.java
@@ -55,7 +55,7 @@ public class User implements UserDetails {
     private Date dateOfBirth;
 
 
-    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, orphanRemoval = true, mappedBy = "user")
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "user")
     @JsonIgnore
     private List<UserGroupAsso> group;
 
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/group/GroupRepositoryTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/group/GroupRepositoryTest.java
index 69cd0518cdf81c5e27d83ebd15410faa43b321d7..52d6a2934e28d1f12f1083f67fc1dbdcc7218f1d 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/group/GroupRepositoryTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/group/GroupRepositoryTest.java
@@ -106,24 +106,22 @@ public class GroupRepositoryTest {
 
     @Test
     void groupShouldHaveAchivments(){
-        Optional<Group> tempGroupe = groupRepository.findByGroupName("test");
-
-
-        assertTrue(tempGroupe.isPresent());
 
+        Group tempgroup = Group.builder().groupName("testiossxjak").build();
         Achievement tempAchievement = Achievement.builder().achievementName("test2").build();
-        Group tempGroup = tempGroupe.get();
 
+        tempgroup.setAchievements(new ArrayList<>(Collections.singletonList(tempAchievement)));
+        groupRepository.save(tempgroup);
 
-        tempGroup.setAchievements(new ArrayList<>(Collections.singletonList(tempAchievement)));
+        Optional<Group> tempGroupe = groupRepository.findByGroupName("testiossxjak");
 
-        groupRepository.save(tempGroup);
 
-        assertTrue(groupRepository.findByGroupName("test").isPresent());
+        assertTrue(tempGroupe.isPresent());
+
 
-        assertTrue(groupRepository.findByGroupName("test").get().getAchievements().contains(tempAchievement));
+        assertTrue(tempGroupe.get().getAchievements().contains(tempAchievement));
 
-        assertNull(groupRepository.findByGroupName("test").get().getAchievements().get(0).getGroups());
+        assertNull(tempGroupe.get().getAchievements().get(0).getGroups());
 
     }