diff --git a/test/db_tests/game_test.dart b/test/db_tests/game_test.dart
index 0c86e45..d726425 100644
--- a/test/db_tests/game_test.dart
+++ b/test/db_tests/game_test.dart
@@ -51,41 +51,36 @@ void main() {
 
   group('game tests', () {
     test('game is added correctly', () async {
-      await withClock(fakeClock, () async {
-        await database.gameDao.addGame(game: testgame);
+      await database.gameDao.addGame(game: testgame);
 
-        final result = await database.gameDao.getGameById(gameId: testgame.id);
+      final result = await database.gameDao.getGameById(gameId: testgame.id);
 
-        expect(result.id, testgame.id);
-        expect(result.name, testgame.name);
-        expect(result.winner, testgame.winner);
-        expect(result.createdAt, testgame.createdAt);
+      expect(result.id, testgame.id);
+      expect(result.name, testgame.name);
+      expect(result.winner, testgame.winner);
+      expect(result.createdAt, testgame.createdAt);
 
-        if (result.group != null) {
-          expect(result.group!.members.length, testgroup.members.length);
+      if (result.group != null) {
+        expect(result.group!.members.length, testgroup.members.length);
 
-          for (int i = 0; i < testgroup.members.length; i++) {
-            expect(result.group!.members[i].id, testgroup.members[i].id);
-            expect(result.group!.members[i].name, testgroup.members[i].name);
-          }
-        } else {
-          fail('Group is null');
+        for (int i = 0; i < testgroup.members.length; i++) {
+          expect(result.group!.members[i].id, testgroup.members[i].id);
+          expect(result.group!.members[i].name, testgroup.members[i].name);
         }
-        if (result.players != null) {
-          expect(result.players!.length, testgame.players!.length);
+      } else {
+        fail('Group is null');
+      }
+      if (result.players != null) {
+        expect(result.players!.length, testgame.players!.length);
 
-          for (int i = 0; i < testgame.players!.length; i++) {
-            expect(result.players![i].id, testgame.players![i].id);
-            expect(result.players![i].name, testgame.players![i].name);
-            expect(
-              result.players![i].createdAt,
-              testgame.players![i].createdAt,
-            );
-          }
-        } else {
-          fail('Players is null');
+        for (int i = 0; i < testgame.players!.length; i++) {
+          expect(result.players![i].id, testgame.players![i].id);
+          expect(result.players![i].name, testgame.players![i].name);
+          expect(result.players![i].createdAt, testgame.players![i].createdAt);
         }
-      });
+      } else {
+        fail('Players is null');
+      }
     });
 
     test('game is deleted correctly', () async {
diff --git a/test/db_tests/group_test.dart b/test/db_tests/group_test.dart
index 5730617..1241419 100644
--- a/test/db_tests/group_test.dart
+++ b/test/db_tests/group_test.dart
@@ -13,6 +13,7 @@ void main() {
   late Player player3;
   late Player player4;
   late Group testgroup;
+  late Group testgroup2;
   final fixedDate = DateTime(2025, 19, 11, 00, 11, 23);
   final fakeClock = Clock(() => fixedDate);
 
@@ -34,6 +35,11 @@ void main() {
         name: 'Test Group',
         members: [player1, player2, player3],
       );
+      testgroup2 = Group(
+        id: 'gr2',
+        name: 'Second Group',
+        members: [player2, player3, player4],
+      );
     });
   });
   tearDown(() async {
@@ -41,53 +47,42 @@ void main() {
   });
   group('group tests', () {
     test('all groups get fetched correctly', () async {
-      await withClock(fakeClock, () async {
-        final testgroup2 = Group(
-          id: 'gr2',
-          name: 'Second Group',
-          members: [player2, player3, player4],
-        );
-        await database.groupDao.addGroup(group: testgroup);
-        await database.groupDao.addGroup(group: testgroup2);
+      await database.groupDao.addGroup(group: testgroup);
+      await database.groupDao.addGroup(group: testgroup2);
 
-        final allGroups = await database.groupDao.getAllGroups();
-        expect(allGroups.length, 2);
+      final allGroups = await database.groupDao.getAllGroups();
+      expect(allGroups.length, 2);
 
-        final fetchedGroup1 = allGroups.firstWhere((g) => g.id == testgroup.id);
-        expect(fetchedGroup1.name, testgroup.name);
-        expect(fetchedGroup1.members.length, testgroup.members.length);
-        expect(fetchedGroup1.members.elementAt(0).id, player1.id);
-        expect(fetchedGroup1.members.elementAt(0).createdAt, player1.createdAt);
+      final fetchedGroup1 = allGroups.firstWhere((g) => g.id == testgroup.id);
+      expect(fetchedGroup1.name, testgroup.name);
+      expect(fetchedGroup1.members.length, testgroup.members.length);
+      expect(fetchedGroup1.members.elementAt(0).id, player1.id);
+      expect(fetchedGroup1.members.elementAt(0).createdAt, player1.createdAt);
 
-        final fetchedGroup2 = allGroups.firstWhere(
-          (g) => g.id == testgroup2.id,
-        );
-        expect(fetchedGroup2.name, testgroup2.name);
-        expect(fetchedGroup2.members.length, testgroup2.members.length);
-        expect(fetchedGroup2.members.elementAt(0).id, player2.id);
-        expect(fetchedGroup2.members.elementAt(0).createdAt, player2.createdAt);
-      });
+      final fetchedGroup2 = allGroups.firstWhere((g) => g.id == testgroup2.id);
+      expect(fetchedGroup2.name, testgroup2.name);
+      expect(fetchedGroup2.members.length, testgroup2.members.length);
+      expect(fetchedGroup2.members.elementAt(0).id, player2.id);
+      expect(fetchedGroup2.members.elementAt(0).createdAt, player2.createdAt);
     });
 
     test('group and group members gets added correctly', () async {
-      await withClock(fakeClock, () async {
-        await database.groupDao.addGroup(group: testgroup);
+      await database.groupDao.addGroup(group: testgroup);
 
-        final result = await database.groupDao.getGroupById(
-          groupId: testgroup.id,
-        );
+      final result = await database.groupDao.getGroupById(
+        groupId: testgroup.id,
+      );
 
-        expect(result.id, testgroup.id);
-        expect(result.name, testgroup.name);
-        expect(result.createdAt, testgroup.createdAt);
+      expect(result.id, testgroup.id);
+      expect(result.name, testgroup.name);
+      expect(result.createdAt, testgroup.createdAt);
 
-        expect(result.members.length, testgroup.members.length);
-        for (int i = 0; i < testgroup.members.length; i++) {
-          expect(result.members[i].id, testgroup.members[i].id);
-          expect(result.members[i].name, testgroup.members[i].name);
-          expect(result.members[i].createdAt, testgroup.members[i].createdAt);
-        }
-      });
+      expect(result.members.length, testgroup.members.length);
+      for (int i = 0; i < testgroup.members.length; i++) {
+        expect(result.members[i].id, testgroup.members[i].id);
+        expect(result.members[i].name, testgroup.members[i].name);
+        expect(result.members[i].createdAt, testgroup.members[i].createdAt);
+      }
     });
 
     test('group gets deleted correctly', () async {
diff --git a/test/db_tests/player_test.dart b/test/db_tests/player_test.dart
index ce75297..fa65f67 100644
--- a/test/db_tests/player_test.dart
+++ b/test/db_tests/player_test.dart
@@ -8,6 +8,7 @@ import 'package:game_tracker/data/dto/player.dart';
 void main() {
   late AppDatabase database;
   late Player testPlayer;
+  late Player testPlayer2;
   final fixedDate = DateTime(2025, 19, 11, 00, 11, 23);
   final fakeClock = Clock(() => fixedDate);
 
@@ -22,6 +23,7 @@ void main() {
 
     withClock(fakeClock, () {
       testPlayer = Player(name: 'Test Player');
+      testPlayer2 = Player(name: 'Second Group');
     });
   });
   tearDown(() async {
@@ -30,39 +32,34 @@ void main() {
 
   group('player tests', () {
     test('all players get fetched correctly', () async {
-      await withClock(fakeClock, () async {
-        final testPlayer2 = Player(name: 'Second Group');
-        await database.playerDao.addPlayer(player: testPlayer);
-        await database.playerDao.addPlayer(player: testPlayer2);
+      await database.playerDao.addPlayer(player: testPlayer);
+      await database.playerDao.addPlayer(player: testPlayer2);
 
-        final allPlayers = await database.playerDao.getAllPlayers();
-        expect(allPlayers.length, 2);
+      final allPlayers = await database.playerDao.getAllPlayers();
+      expect(allPlayers.length, 2);
 
-        final fetchedPlayer1 = allPlayers.firstWhere(
-          (g) => g.id == testPlayer.id,
-        );
-        expect(fetchedPlayer1.name, testPlayer.name);
-        expect(fetchedPlayer1.createdAt, testPlayer.createdAt);
+      final fetchedPlayer1 = allPlayers.firstWhere(
+        (g) => g.id == testPlayer.id,
+      );
+      expect(fetchedPlayer1.name, testPlayer.name);
+      expect(fetchedPlayer1.createdAt, testPlayer.createdAt);
 
-        final fetchedPlayer2 = allPlayers.firstWhere(
-          (g) => g.id == testPlayer2.id,
-        );
-        expect(fetchedPlayer2.name, testPlayer2.name);
-        expect(fetchedPlayer2.createdAt, testPlayer2.createdAt);
-      });
+      final fetchedPlayer2 = allPlayers.firstWhere(
+        (g) => g.id == testPlayer2.id,
+      );
+      expect(fetchedPlayer2.name, testPlayer2.name);
+      expect(fetchedPlayer2.createdAt, testPlayer2.createdAt);
     });
 
     test('players get inserted correcly ', () async {
-      await withClock(fakeClock, () async {
-        await database.playerDao.addPlayer(player: testPlayer);
-        final result = await database.playerDao.getPlayerById(
-          playerId: testPlayer.id,
-        );
+      await database.playerDao.addPlayer(player: testPlayer);
+      final result = await database.playerDao.getPlayerById(
+        playerId: testPlayer.id,
+      );
 
-        expect(result.id, testPlayer.id);
-        expect(result.name, testPlayer.name);
-        expect(result.createdAt, testPlayer.createdAt);
-      });
+      expect(result.id, testPlayer.id);
+      expect(result.name, testPlayer.name);
+      expect(result.createdAt, testPlayer.createdAt);
     });
 
     test('players get deleted correcly ', () async {