diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/group/UserGroupAsso.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/group/UserGroupAsso.java
index 663fa1f0d60ae5587adcbcf33216ce58561d43af..dcbb4544d5bb68fea2c2cb2582e4eeae7425f251 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/group/UserGroupAsso.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/group/UserGroupAsso.java
@@ -2,9 +2,7 @@ package ntnu.idatt2016.v233.SmartMat.entity.group;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import jakarta.persistence.*;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 import ntnu.idatt2016.v233.SmartMat.entity.user.User;
 
 /**
@@ -17,7 +15,7 @@ import ntnu.idatt2016.v233.SmartMat.entity.user.User;
 @Entity
 @AllArgsConstructor
 @NoArgsConstructor
-@Data
+@Getter @Setter
 @Table(name = "user_group")
 public class UserGroupAsso {
 
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/service/group/UserGroupAssoService.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/service/group/UserGroupAssoService.java
index 463dd5d6fa53895855b2cb0df30f0c972bc0ec39..736dabbc7e78fd003da06ffdb74227f14a97126e 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/service/group/UserGroupAssoService.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/service/group/UserGroupAssoService.java
@@ -22,12 +22,12 @@ public class UserGroupAssoService {
     private GroupRepository groupRepository;
     private final UserRepository userRepository;
 
-    public void save(User user, Group group, String userAuthority) {
+    public void save(User user, Group group, String authority) {
         UserGroupAsso userGroupTable1 = new UserGroupAsso();
         userGroupTable1.setGroup(group);
         userGroupTable1.setUser(user);
         userGroupTable1.setPrimaryGroup(true);
-        userGroupTable1.setGroupAuthority(userAuthority);
+        userGroupTable1.setGroupAuthority(authority);
         userGroupTable1.setId(UserGroupId.builder()
                         .groupId(group.getGroupId())
                         .username(user.getUsername())
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/service/group/UserGroupAssoServiceTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/service/group/UserGroupAssoServiceTest.java
index 726b64cb8d5f1d4bd2d187ac3449f6f9d8218d24..2c705f3ed275a488c5db55fb0079075f1ce74c35 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/service/group/UserGroupAssoServiceTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/service/group/UserGroupAssoServiceTest.java
@@ -47,6 +47,7 @@ public class UserGroupAssoServiceTest {
         userGroupAsso.setUser(user);
         userGroupAsso.setGroup(group);
         userGroupAsso.setPrimaryGroup(true);
+        userGroupAsso.setGroupAuthority("ADMIN");
         userGroupAsso.setId(UserGroupId.builder()
                 .groupId(group.getGroupId())
                 .username(user.getUsername())
@@ -57,7 +58,7 @@ public class UserGroupAssoServiceTest {
     public void testSave() {
         userGroupAssoService.save(user, group, "ADMIN");
 
-        verify(userGroupAssoRepository, times(1)).save(userGroupAsso);
+        verify(userGroupAssoRepository, times(1)).save(any(userGroupAsso.getClass()));
         verify(userRepository, times(1)).save(user);
         verify(groupRepository, times(1)).save(group);
     }