diff --git a/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/LeagueManagerFacadeImplTest.java b/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/LeagueManagerFacadeImplTest.java
index ee74b01db2dc96b61e9ac67d7dd66e4913b22d5d..f954dcb08fbc775d939ba6bbf63fd0b28278e668 100644
--- a/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/LeagueManagerFacadeImplTest.java
+++ b/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/LeagueManagerFacadeImplTest.java
@@ -45,13 +45,6 @@ public class LeagueManagerFacadeImplTest {
         return team;
     }
 
-    public TeamDto buildTeamDTO(Long id, String name) {
-        var team = new TeamDto();
-        team.setId(id);
-        team.setName(name);
-        return team;
-    }
-
     public Game buildGameMock(Long id) {
         var game = mock(Game.class);
         when(game.getId()).thenReturn(id);
@@ -111,7 +104,7 @@ public class LeagueManagerFacadeImplTest {
     public void updateGameScore() {
         var game = buildGameMock(1L);
         var gameUpdate = buildGameUpdateDTO(game, 1, 2);
-        when(gameService.findGame(1L)).thenReturn(Optional.ofNullable(game));
+        when(gameService.findGame(1L)).thenReturn(Optional.of(game));
         leagueManagerFacade.updateGameScore(gameUpdate);
         verify(gameService).updateGameScore(game, 1, 2);
     }
@@ -122,6 +115,7 @@ public class LeagueManagerFacadeImplTest {
         when(gameService.findGame(1L)).thenReturn(Optional.ofNullable(game));
         var team = buildTeamMock(1L, "edmonton");
         when(teamService.findTeam(1L)).thenReturn(Optional.ofNullable(team));
+        assert game != null;
         var gameWinner = buildGameWinnerDTO(game, 1L);
         leagueManagerFacade.setGameWinner(gameWinner);
         verify(gameService).setGameWinner(game, team);
diff --git a/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/UserFacadeImplTest.java b/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/UserFacadeImplTest.java
index 01593a2a6dd9159ce4f704c33d19dc6c0f1302f5..afa09e8c64860e32ba180026b1a773e91a336e48 100644
--- a/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/UserFacadeImplTest.java
+++ b/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/UserFacadeImplTest.java
@@ -216,18 +216,16 @@ class UserFacadeImplTest {
         return game;
     }
 
-    private Team addHomeGames(Team team, Game... games) {
+    private void addHomeGames(Team team, Game... games) {
         for (Game game : games)
             when(game.getHomeTeam()).thenReturn(team);
         when(team.getHomeGames()).thenReturn(new HashSet<>(Arrays.asList(games)));
-        return team;
     }
 
-    private Team addAwayGames(Team team, Game... games) {
+    private void addAwayGames(Team team, Game... games) {
         for (Game game : games)
             when(game.getAwayTeam()).thenReturn(team);
         when(team.getAwayGames()).thenReturn(new HashSet<>(Arrays.asList(games)));
-        return team;
     }
 
     public PlayerDto buildPlayerDTO(Long id, String name) {