diff --git a/test/game/bloc/game_bloc_test.dart b/test/game/bloc/game_bloc_test.dart
index 43d3f99a..470e146e 100644
--- a/test/game/bloc/game_bloc_test.dart
+++ b/test/game/bloc/game_bloc_test.dart
@@ -12,11 +12,10 @@ void main() {
 
     group('LostBall', () {
       blocTest<GameBloc, GameState>(
-        "doesn't decrease ball "
-        'when no balls left',
+        'decreases number of balls',
         build: GameBloc.new,
         act: (bloc) {
-          for (var i = 0; i <= bloc.state.balls; i++) {
+          for (var i = 0; i < bloc.state.balls; i++) {
             bloc.add(const BallLost());
           }
         },
diff --git a/test/game/components/wall_test.dart b/test/game/components/wall_test.dart
index 18c7ea5b..f280b9a8 100644
--- a/test/game/components/wall_test.dart
+++ b/test/game/components/wall_test.dart
@@ -19,18 +19,14 @@ void main() {
         () {
           final wall = MockBottomWall();
           final ballController = MockBallController();
-          final ball = MockBall();
+          final ball = MockControlledBall();
           final componentSet = MockComponentSet();
 
           when(() => componentSet.whereType<BallController>())
               .thenReturn([ballController]);
           when(() => ball.children).thenReturn(componentSet);
 
-          BottomWallBallContactCallback()
-            // Remove once https://github.com/flame-engine/flame/pull/1415
-            // is merged
-            ..end(MockBall(), MockBottomWall(), MockContact())
-            ..begin(ball, wall, MockContact());
+          BottomWallBallContactCallback().begin(ball, wall, MockContact());
 
           verify(ballController.lost).called(1);
         },
diff --git a/test/game/pinball_game_test.dart b/test/game/pinball_game_test.dart
index f418bad0..21a17afa 100644
--- a/test/game/pinball_game_test.dart
+++ b/test/game/pinball_game_test.dart
@@ -71,12 +71,14 @@ void main() {
       final tapUpEvent = MockTapUpInfo();
       when(() => tapUpEvent.eventPosition).thenReturn(eventPosition);
 
+      final previousBalls = game.descendants().whereType<Ball>().toList();
+
       game.onTapUp(tapUpEvent);
       await game.ready();
 
       expect(
         game.children.whereType<Ball>().length,
-        equals(1),
+        equals(previousBalls.length + 1),
       );
     });
   });
diff --git a/test/helpers/mocks.dart b/test/helpers/mocks.dart
index c0dec5f5..748b48f3 100644
--- a/test/helpers/mocks.dart
+++ b/test/helpers/mocks.dart
@@ -21,6 +21,8 @@ class MockBody extends Mock implements Body {}
 
 class MockBall extends Mock implements Ball {}
 
+class MockControlledBall extends Mock implements ControlledBall {}
+
 class MockBallController extends Mock implements BallController {}
 
 class MockContact extends Mock implements Contact {}