diff --git a/lib/data/dto/game.dart b/lib/data/dto/game.dart
index 125af48..c84779d 100644
--- a/lib/data/dto/game.dart
+++ b/lib/data/dto/game.dart
@@ -1,5 +1,6 @@
 import 'package:game_tracker/data/dto/group.dart';
 import 'package:game_tracker/data/dto/player.dart';
+import 'package:uuid/uuid.dart';
 
 class Game {
   final String id;
@@ -9,12 +10,12 @@ class Game {
   final String winner;
 
   Game({
+    String? id,
+    required this.name,
     this.players,
     this.group,
     this.winner = '',
-    required this.id,
-    required this.name,
-  });
+  }) : id = id ?? const Uuid().v4();
 
   @override
   String toString() {
diff --git a/lib/data/dto/group.dart b/lib/data/dto/group.dart
index 427a52b..0420477 100644
--- a/lib/data/dto/group.dart
+++ b/lib/data/dto/group.dart
@@ -1,11 +1,13 @@
 import 'package:game_tracker/data/dto/player.dart';
+import 'package:uuid/uuid.dart';
 
 class Group {
   final String id;
   final String name;
   final List<Player> members;
 
-  Group({required this.id, required this.name, required this.members});
+  Group({String? id, required this.name, required this.members})
+    : id = id ?? const Uuid().v4();
 
   @override
   String toString() {
diff --git a/lib/data/dto/player.dart b/lib/data/dto/player.dart
index 631a51f..1b00c2c 100644
--- a/lib/data/dto/player.dart
+++ b/lib/data/dto/player.dart
@@ -1,8 +1,10 @@
+import 'package:uuid/uuid.dart';
+
 class Player {
   final String id;
   final String name;
 
-  Player({required this.id, required this.name});
+  Player({String? id, required this.name}) : id = id ?? const Uuid().v4();
 
   @override
   String toString() {
diff --git a/lib/presentation/views/main_menu/groups_view.dart b/lib/presentation/views/main_menu/groups_view.dart
index 200f1d0..73f3509 100644
--- a/lib/presentation/views/main_menu/groups_view.dart
+++ b/lib/presentation/views/main_menu/groups_view.dart
@@ -21,12 +21,11 @@ class _GroupsViewState extends State<GroupsView> {
   late Future<List<Group>> _allGroupsFuture;
   late final AppDatabase db;
 
-  final player = Player(id: 'p1', name: 'Sample');
+  final player = Player(name: 'Skeleton Player');
   late final List<Group> skeletonData = List.filled(
     7,
     Group(
-      id: '0',
-      name: 'Sample Game',
+      name: 'Skeleton Game',
       members: [player, player, player, player, player, player],
     ),
   );
diff --git a/test/db_tests/game_test.dart b/test/db_tests/game_test.dart
index bee3ff8..4f4b23f 100644
--- a/test/db_tests/game_test.dart
+++ b/test/db_tests/game_test.dart
@@ -12,6 +12,7 @@ void main() {
   late Player player2;
   late Player player3;
   late Player player4;
+  late Player player5;
   late Group testgroup;
   late Game testgame;
 
@@ -24,20 +25,16 @@ void main() {
       ),
     );
 
-    player1 = Player(id: 'p1', name: 'Alice');
-    player2 = Player(id: 'p2', name: 'Bob');
-    player3 = Player(id: 'p3', name: 'Charlie');
-    player4 = Player(id: 'p4', name: 'Diana');
-    testgroup = Group(
-      id: 'gr1',
-      name: 'Test Group',
-      members: [player1, player2, player3],
-    );
+    player1 = Player(name: 'Alice');
+    player2 = Player(name: 'Bob');
+    player3 = Player(name: 'Charlie');
+    player4 = Player(name: 'Diana');
+    player5 = Player(name: 'Eve');
+    testgroup = Group(name: 'Test Group', members: [player1, player2, player3]);
     testgame = Game(
-      id: 'ga1',
       name: 'Test Game',
       group: testgroup,
-      players: [player4],
+      players: [player4, player5],
     );
   });
   tearDown(() async {
diff --git a/test/db_tests/group_test.dart b/test/db_tests/group_test.dart
index d8d6ce2..3a9d8ca 100644
--- a/test/db_tests/group_test.dart
+++ b/test/db_tests/group_test.dart
@@ -22,15 +22,11 @@ void main() {
       ),
     );
 
-    player1 = Player(id: 'p1', name: 'Alice');
-    player2 = Player(id: 'p2', name: 'Bob');
-    player3 = Player(id: 'p3', name: 'Charlie');
-    player4 = Player(id: 'p4', name: 'Diana');
-    testgroup = Group(
-      id: 'gr1',
-      name: 'Test Group',
-      members: [player1, player2, player3],
-    );
+    player1 = Player(name: 'Alice');
+    player2 = Player(name: 'Bob');
+    player3 = Player(name: 'Charlie');
+    player4 = Player(name: 'Diana');
+    testgroup = Group(name: 'Test Group', members: [player1, player2, player3]);
   });
   tearDown(() async {
     await database.close();
@@ -121,12 +117,12 @@ void main() {
 
       expect(playerAdded, true);
 
-      final playerAdded2 = await database.playerGroupDao.isPlayerInGroup(
-        playerId: 'a',
+      final playerNotAdded = !await database.playerGroupDao.isPlayerInGroup(
+        playerId: '',
         groupId: testgroup.id,
       );
 
-      expect(playerAdded2, false);
+      expect(playerNotAdded, true);
 
       expect(playerAdded, true);
 
diff --git a/test/db_tests/player_test.dart b/test/db_tests/player_test.dart
index 5258c66..91f4acb 100644
--- a/test/db_tests/player_test.dart
+++ b/test/db_tests/player_test.dart
@@ -17,7 +17,7 @@ void main() {
       ),
     );
 
-    testPlayer = Player(id: 'test_id', name: 'Test Player');
+    testPlayer = Player(name: 'Test Player');
   });
   tearDown(() async {
     await database.close();
@@ -25,7 +25,7 @@ void main() {
 
   group('player tests', () {
     test('all players get fetched correctly', () async {
-      final testPlayer2 = Player(id: 'gr2', name: 'Second Group');
+      final testPlayer2 = Player(name: 'Second Group');
       await database.playerDao.addPlayer(player: testPlayer);
       await database.playerDao.addPlayer(player: testPlayer2);