diff --git a/test/game/components/ball_test.dart b/test/game/components/ball_test.dart
index 8ac32212..e83dd619 100644
--- a/test/game/components/ball_test.dart
+++ b/test/game/components/ball_test.dart
@@ -11,10 +11,9 @@ import '../../helpers/helpers.dart';
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
+  final flameTester = FlameTester(PinballGameTest.create);
 
   group('Ball', () {
-    final flameTester = FlameTester(PinballGameTest.create);
-
     flameTester.test(
       'loads correctly',
       (game) async {
diff --git a/test/game/components/baseboard_test.dart b/test/game/components/baseboard_test.dart
index 51002cef..bc9f68af 100644
--- a/test/game/components/baseboard_test.dart
+++ b/test/game/components/baseboard_test.dart
@@ -5,12 +5,10 @@ import 'package:flame_test/flame_test.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:pinball/game/game.dart';
 
-import '../../helpers/helpers.dart';
-
 void main() {
   group('Baseboard', () {
     TestWidgetsFlutterBinding.ensureInitialized();
-    final flameTester = FlameTester(PinballGameTest.create);
+    final flameTester = FlameTester(Forge2DGame.new);
 
     flameTester.test(
       'loads correctly',
diff --git a/test/game/components/bonus_word_test.dart b/test/game/components/bonus_word_test.dart
index 012ef2d8..b45bd61a 100644
--- a/test/game/components/bonus_word_test.dart
+++ b/test/game/components/bonus_word_test.dart
@@ -12,10 +12,9 @@ import '../../helpers/helpers.dart';
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
+  final flameTester = FlameTester(PinballGameTest.create);
 
   group('BonusWord', () {
-    final flameTester = FlameTester(PinballGameTest.create);
-
     flameTester.test(
       'loads the letters correctly',
       (game) async {
diff --git a/test/game/components/flipper_test.dart b/test/game/components/flipper_test.dart
index ead927bf..0e281d07 100644
--- a/test/game/components/flipper_test.dart
+++ b/test/game/components/flipper_test.dart
@@ -176,6 +176,7 @@ void main() {
             final flipper = Flipper.left(position: Vector2.zero());
             final ball = Ball(position: Vector2.zero());
 
+            await game.ready();
             await game.ensureAddAll([flipper, ball]);
 
             expect(
diff --git a/test/game/components/joint_anchor_test.dart b/test/game/components/joint_anchor_test.dart
index a65f9e1a..8278d43a 100644
--- a/test/game/components/joint_anchor_test.dart
+++ b/test/game/components/joint_anchor_test.dart
@@ -5,14 +5,11 @@ import 'package:flame_test/flame_test.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:pinball/game/game.dart';
 
-import '../../helpers/helpers.dart';
-
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
+  final flameTester = FlameTester(Forge2DGame.new);
 
   group('JointAnchor', () {
-    final flameTester = FlameTester(PinballGameTest.create);
-
     flameTester.test(
       'loads correctly',
       (game) async {
diff --git a/test/game/components/pathway_test.dart b/test/game/components/pathway_test.dart
index 43af9b77..80c968d8 100644
--- a/test/game/components/pathway_test.dart
+++ b/test/game/components/pathway_test.dart
@@ -6,11 +6,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:pinball/game/game.dart';
 
-import '../../helpers/helpers.dart';
-
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
-  final flameTester = FlameTester(PinballGameTest.create);
+  final flameTester = FlameTester(Forge2DGame.new);
 
   group('Pathway', () {
     const width = 50.0;
diff --git a/test/game/components/plunger_test.dart b/test/game/components/plunger_test.dart
index 1ca29e85..ecc4265e 100644
--- a/test/game/components/plunger_test.dart
+++ b/test/game/components/plunger_test.dart
@@ -13,7 +13,7 @@ import '../../helpers/helpers.dart';
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
-  final flameTester = FlameTester(PinballGameTest.create);
+  final flameTester = FlameTester(Forge2DGame.new);
 
   group('Plunger', () {
     const compressionDistance = 0.0;
diff --git a/test/game/components/wall_test.dart b/test/game/components/wall_test.dart
index e60046ad..774cd675 100644
--- a/test/game/components/wall_test.dart
+++ b/test/game/components/wall_test.dart
@@ -10,6 +10,7 @@ import '../../helpers/helpers.dart';
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
+  final flameTester = FlameTester(Forge2DGame.new);
 
   group('Wall', () {
     group('BottomWallBallContactCallback', () {
@@ -32,7 +33,6 @@ void main() {
         },
       );
     });
-    final flameTester = FlameTester(PinballGameTest.create);
 
     flameTester.test(
       'loads correctly',