diff --git a/.github/workflows/unit-tests-push.yml b/.github/workflows/unit-tests-push.yml
index f64fe892..a05c42bd 100644
--- a/.github/workflows/unit-tests-push.yml
+++ b/.github/workflows/unit-tests-push.yml
@@ -58,7 +58,7 @@ jobs:
         run: ss -tuln
       - name: Run all tests with sonar analysis
         run: |
-          ./mvnw -B org.jacoco:jacoco-maven-plugin:prepare-agent clean test sonar:sonar -Dsonar.projectKey=Arquisoft_wiq_es04b -Dsonar.organization=arquisoft -Dsonar.branch.name=${{ github.ref }} -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=${{ secrets.SONAR_TOKEN }} -Dspring.profiles.active=test -Dspring.datasource.url=jdbc:mysql://localhost:3306/test_database -Dspring.datasource.username=root -Dspring.datasource.password=root -Dspring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -Dtest="com.uniovi.Wiq_UnitTests,com.uniovi.CucumberRunnerTests"
+          ./mvnw -B org.jacoco:jacoco-maven-plugin:prepare-agent clean test sonar:sonar -DEXCLUDE_JUNIT=true -Dsonar.projectKey=Arquisoft_wiq_es04b -Dsonar.organization=arquisoft -Dsonar.branch.name=${{ github.ref }} -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=${{ secrets.SONAR_TOKEN }} -Dspring.profiles.active=test -Dspring.datasource.url=jdbc:mysql://localhost:3306/test_database -Dspring.datasource.username=root -Dspring.datasource.password=root -Dspring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -Dtest="com.uniovi.Wiq_UnitTests,com.uniovi.CucumberRunnerTests"
         env:
           SPRING_PROFILES_ACTIVE: test
           headless: true
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 65f9bebe..54cdb311 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,17 +32,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.junit.jupiter</groupId>
-                    <artifactId>junit-jupiter-engine</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -189,5 +178,48 @@
             </plugin>
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <!-- This profile is activated when the EXCLUDE_JUNIT environment variable is set to true -->
+            <id>exclude-junit</id>
+            <activation>
+                <property>
+                    <name>env.EXCLUDE_JUNIT</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-test</artifactId>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>org.junit.jupiter</groupId>
+                            <artifactId>junit-jupiter-engine</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+            </dependencies>
+        </profile>
 
+        <profile>
+            <!-- This profile is active by default when the EXCLUDE_JUNIT environment variable is not set -->
+            <id>include-junit</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+                <property>
+                    <name>!env.EXCLUDE_JUNIT</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-test</artifactId>
+                    <scope>test</scope>
+                    <!-- No exclusions -->
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
 </project>
diff --git a/src/main/java/com/uniovi/entities/Role.java b/src/main/java/com/uniovi/entities/Role.java
index deaa4b6a..c767c425 100644
--- a/src/main/java/com/uniovi/entities/Role.java
+++ b/src/main/java/com/uniovi/entities/Role.java
@@ -16,7 +16,7 @@ public class Role {
     @Id
     private String name;
 
-    @ManyToMany(mappedBy = "roles")
+    @ManyToMany(mappedBy = "roles", fetch = FetchType.EAGER)
     private Set<Player> players = new HashSet<>();
 
     public Role(String name) {
diff --git a/src/main/java/com/uniovi/services/InsertSampleDataService.java b/src/main/java/com/uniovi/services/InsertSampleDataService.java
index fce3766e..f05dc00c 100644
--- a/src/main/java/com/uniovi/services/InsertSampleDataService.java
+++ b/src/main/java/com/uniovi/services/InsertSampleDataService.java
@@ -50,6 +50,15 @@ public InsertSampleDataService(PlayerService playerService, QuestionService ques
     @Transactional
     @EventListener(ApplicationReadyEvent.class) // Uncomment this line to insert sample data on startup
     public void insertSampleQuestions() {
+        if (!playerService.getUserByEmail("test@test.com").isPresent()) {
+            PlayerDto player = new PlayerDto();
+            player.setEmail("test@test.com");
+            player.setUsername("test");
+            player.setPassword("test");
+            player.setRoles(new String[]{"ROLE_USER"});
+            playerService.generateApiKey(playerService.addNewPlayer(player));
+        }
+
         if (Arrays.stream(environment.getActiveProfiles()).anyMatch(env -> (env.equalsIgnoreCase("test")))) {
             log.info("Test profile active, skipping sample data insertion");
             return;
@@ -60,14 +69,6 @@ public void insertSampleQuestions() {
 
     @Transactional
     public void generateSampleData() {
-        if (!playerService.getUserByEmail("test@test.com").isPresent()) {
-            PlayerDto player = new PlayerDto();
-            player.setEmail("test@test.com");
-            player.setUsername("test");
-            player.setPassword("test");
-            player.setRoles(new String[]{"ROLE_USER"});
-            playerService.generateApiKey(playerService.addNewPlayer(player));
-        }
 
         questionRepository.deleteAll();
 
diff --git a/src/test/java/com/uniovi/Wiq_UnitTests.java b/src/test/java/com/uniovi/Wiq_UnitTests.java
index f1003da9..f96806f0 100644
--- a/src/test/java/com/uniovi/Wiq_UnitTests.java
+++ b/src/test/java/com/uniovi/Wiq_UnitTests.java
@@ -9,8 +9,6 @@
 import org.springframework.test.context.ActiveProfiles;
 import java.util.List;
 
-import java.util.Optional;
-
 @SpringBootTest
 @Tag("unit")
 @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
@@ -24,6 +22,6 @@ public class Wiq_UnitTests {
     @Order(1)
     public void testPlayerService() {
         List<Player> players = playerService.getUsersByRole("ROLE_USER");
-        Assertions.assertEquals(0, players.size());
+        Assertions.assertEquals(1, players.size());
     }
 }