diff --git a/packages/pinball_components/test/src/components/multiplier/golden/multipliers/x2-dimmed.png b/packages/pinball_components/test/src/components/golden/multipliers/x2-dimmed.png
similarity index 100%
rename from packages/pinball_components/test/src/components/multiplier/golden/multipliers/x2-dimmed.png
rename to packages/pinball_components/test/src/components/golden/multipliers/x2-dimmed.png
diff --git a/packages/pinball_components/test/src/components/multiplier/golden/multipliers/x2-lit.png b/packages/pinball_components/test/src/components/golden/multipliers/x2-lit.png
similarity index 100%
rename from packages/pinball_components/test/src/components/multiplier/golden/multipliers/x2-lit.png
rename to packages/pinball_components/test/src/components/golden/multipliers/x2-lit.png
diff --git a/packages/pinball_components/test/src/components/multiplier/golden/multipliers/x3-dimmed.png b/packages/pinball_components/test/src/components/golden/multipliers/x3-dimmed.png
similarity index 100%
rename from packages/pinball_components/test/src/components/multiplier/golden/multipliers/x3-dimmed.png
rename to packages/pinball_components/test/src/components/golden/multipliers/x3-dimmed.png
diff --git a/packages/pinball_components/test/src/components/multiplier/golden/multipliers/x3-lit.png b/packages/pinball_components/test/src/components/golden/multipliers/x3-lit.png
similarity index 100%
rename from packages/pinball_components/test/src/components/multiplier/golden/multipliers/x3-lit.png
rename to packages/pinball_components/test/src/components/golden/multipliers/x3-lit.png
diff --git a/packages/pinball_components/test/src/components/multiplier/golden/multipliers/x4-dimmed.png b/packages/pinball_components/test/src/components/golden/multipliers/x4-dimmed.png
similarity index 100%
rename from packages/pinball_components/test/src/components/multiplier/golden/multipliers/x4-dimmed.png
rename to packages/pinball_components/test/src/components/golden/multipliers/x4-dimmed.png
diff --git a/packages/pinball_components/test/src/components/multiplier/golden/multipliers/x4-lit.png b/packages/pinball_components/test/src/components/golden/multipliers/x4-lit.png
similarity index 100%
rename from packages/pinball_components/test/src/components/multiplier/golden/multipliers/x4-lit.png
rename to packages/pinball_components/test/src/components/golden/multipliers/x4-lit.png
diff --git a/packages/pinball_components/test/src/components/multiplier/golden/multipliers/x5-dimmed.png b/packages/pinball_components/test/src/components/golden/multipliers/x5-dimmed.png
similarity index 100%
rename from packages/pinball_components/test/src/components/multiplier/golden/multipliers/x5-dimmed.png
rename to packages/pinball_components/test/src/components/golden/multipliers/x5-dimmed.png
diff --git a/packages/pinball_components/test/src/components/multiplier/golden/multipliers/x5-lit.png b/packages/pinball_components/test/src/components/golden/multipliers/x5-lit.png
similarity index 100%
rename from packages/pinball_components/test/src/components/multiplier/golden/multipliers/x5-lit.png
rename to packages/pinball_components/test/src/components/golden/multipliers/x5-lit.png
diff --git a/packages/pinball_components/test/src/components/multiplier/golden/multipliers/x6-dimmed.png b/packages/pinball_components/test/src/components/golden/multipliers/x6-dimmed.png
similarity index 100%
rename from packages/pinball_components/test/src/components/multiplier/golden/multipliers/x6-dimmed.png
rename to packages/pinball_components/test/src/components/golden/multipliers/x6-dimmed.png
diff --git a/packages/pinball_components/test/src/components/multiplier/golden/multipliers/x6-lit.png b/packages/pinball_components/test/src/components/golden/multipliers/x6-lit.png
similarity index 100%
rename from packages/pinball_components/test/src/components/multiplier/golden/multipliers/x6-lit.png
rename to packages/pinball_components/test/src/components/golden/multipliers/x6-lit.png
diff --git a/packages/pinball_components/test/src/components/multiplier/golden/multipliers/x2-active.png b/packages/pinball_components/test/src/components/multiplier/golden/multipliers/x2-active.png
deleted file mode 100644
index 94001e27..00000000
Binary files a/packages/pinball_components/test/src/components/multiplier/golden/multipliers/x2-active.png and /dev/null differ
diff --git a/packages/pinball_components/test/src/components/multiplier/golden/multipliers/x2-inactive.png b/packages/pinball_components/test/src/components/multiplier/golden/multipliers/x2-inactive.png
deleted file mode 100644
index ca2d8bf1..00000000
Binary files a/packages/pinball_components/test/src/components/multiplier/golden/multipliers/x2-inactive.png and /dev/null differ
diff --git a/test/game/pinball_game_test.dart b/test/game/pinball_game_test.dart
index 9e002836..30396981 100644
--- a/test/game/pinball_game_test.dart
+++ b/test/game/pinball_game_test.dart
@@ -107,7 +107,6 @@ void main() {
 
   setUp(() {
     gameBloc = MockGameBloc();
-    // ignore: avoid_dynamic_calls
     whenListen(
       gameBloc,
       const Stream<GameState>.empty(),