diff --git a/test/helpers/command_helper.dart b/test/helpers/command_helper.dart
index 49fe42302..5650369c5 100644
--- a/test/helpers/command_helper.dart
+++ b/test/helpers/command_helper.dart
@@ -5,11 +5,11 @@ import 'package:mocktail/mocktail.dart';
 import 'package:pub_updater/pub_updater.dart';
 import 'package:very_good_cli/src/command_runner.dart';
 
-class MockLogger extends Mock implements Logger {}
+class _MockLogger extends Mock implements Logger {}
 
-class MockProgress extends Mock implements Progress {}
+class _MockProgress extends Mock implements Progress {}
 
-class MockPubUpdater extends Mock implements PubUpdater {}
+class _MockPubUpdater extends Mock implements PubUpdater {}
 
 void Function() _overridePrint(void Function(List<String>) fn) {
   return () {
@@ -35,9 +35,9 @@ void Function() withRunner(
   ) runnerFn,
 ) {
   return _overridePrint((printLogs) async {
-    final logger = MockLogger();
-    final progress = MockProgress();
-    final pubUpdater = MockPubUpdater();
+    final logger = _MockLogger();
+    final progress = _MockProgress();
+    final pubUpdater = _MockPubUpdater();
     final progressLogs = <String>[];
     final commandRunner = VeryGoodCommandRunner(
       logger: logger,
diff --git a/test/src/command_runner_test.dart b/test/src/command_runner_test.dart
index be414d08c..0dc703af1 100644
--- a/test/src/command_runner_test.dart
+++ b/test/src/command_runner_test.dart
@@ -10,11 +10,11 @@ import 'package:test/test.dart';
 import 'package:very_good_cli/src/command_runner.dart';
 import 'package:very_good_cli/src/version.dart';
 
-class MockLogger extends Mock implements Logger {}
+class _MockLogger extends Mock implements Logger {}
 
-class MockPubUpdater extends Mock implements PubUpdater {}
+class _MockPubUpdater extends Mock implements PubUpdater {}
 
-class MockProgress extends Mock implements Progress {}
+class _MockProgress extends Mock implements Progress {}
 
 const expectedUsage = [
   '🦄 A Very Good Command-Line Interface\n'
@@ -60,13 +60,13 @@ void main() {
     late VeryGoodCommandRunner commandRunner;
 
     setUp(() {
-      pubUpdater = MockPubUpdater();
+      pubUpdater = _MockPubUpdater();
 
       when(
         () => pubUpdater.getLatestVersion(any()),
       ).thenAnswer((_) async => packageVersion);
 
-      logger = MockLogger();
+      logger = _MockLogger();
 
       commandRunner = VeryGoodCommandRunner(
         logger: logger,
@@ -107,7 +107,7 @@ void main() {
               currentVersion: any(named: 'currentVersion'),
             ),
           ).thenAnswer((_) => Future.value(true));
-          final progress = MockProgress();
+          final progress = _MockProgress();
           final progressLogs = <String>[];
           when(() => progress.complete(any())).thenAnswer((_) {
             final message = _.positionalArguments.elementAt(0) as String?;
diff --git a/test/src/commands/create/commands/dart_cli_test.dart b/test/src/commands/create/commands/dart_cli_test.dart
index df6364779..a19ed00b5 100644
--- a/test/src/commands/create/commands/dart_cli_test.dart
+++ b/test/src/commands/create/commands/dart_cli_test.dart
@@ -9,17 +9,19 @@ import 'package:very_good_cli/src/commands/commands.dart';
 
 import '../../../../helpers/helpers.dart';
 
-class MockLogger extends Mock implements Logger {}
+class _MockLogger extends Mock implements Logger {}
 
-class MockMasonGenerator extends Mock implements MasonGenerator {}
+class _MockProgress extends Mock implements Progress {}
 
-class MockGeneratorHooks extends Mock implements GeneratorHooks {}
+class _MockMasonGenerator extends Mock implements MasonGenerator {}
 
-class MockArgResults extends Mock implements ArgResults {}
+class _MockGeneratorHooks extends Mock implements GeneratorHooks {}
 
-class FakeLogger extends Fake implements Logger {}
+class _MockArgResults extends Mock implements ArgResults {}
 
-class FakeDirectoryGeneratorTarget extends Fake
+class _FakeLogger extends Fake implements Logger {}
+
+class _FakeDirectoryGeneratorTarget extends Fake
     implements DirectoryGeneratorTarget {}
 
 final expectedUsage = [
@@ -47,14 +49,14 @@ void main() {
   late Logger logger;
 
   setUpAll(() {
-    registerFallbackValue(FakeDirectoryGeneratorTarget());
-    registerFallbackValue(FakeLogger());
+    registerFallbackValue(_FakeDirectoryGeneratorTarget());
+    registerFallbackValue(_FakeLogger());
   });
 
   setUp(() {
-    logger = MockLogger();
+    logger = _MockLogger();
 
-    final progress = MockProgress();
+    final progress = _MockProgress();
 
     when(() => logger.progress(any())).thenReturn(progress);
   });
@@ -104,8 +106,8 @@ void main() {
       late MasonGenerator generator;
 
       setUp(() {
-        hooks = MockGeneratorHooks();
-        generator = MockMasonGenerator();
+        hooks = _MockGeneratorHooks();
+        generator = _MockMasonGenerator();
 
         when(() => generator.hooks).thenReturn(hooks);
         when(
@@ -155,7 +157,7 @@ void main() {
         final tempDirectory = Directory.systemTemp.createTempSync();
         addTearDown(() => tempDirectory.deleteSync(recursive: true));
 
-        final argResults = MockArgResults();
+        final argResults = _MockArgResults();
         final command = CreateDartCLI(
           logger: logger,
           generatorFromBundle: (_) async => throw Exception('oops'),
diff --git a/test/src/commands/create/commands/dart_package_test.dart b/test/src/commands/create/commands/dart_package_test.dart
index a26908ee5..7e69b9ffb 100644
--- a/test/src/commands/create/commands/dart_package_test.dart
+++ b/test/src/commands/create/commands/dart_package_test.dart
@@ -9,17 +9,19 @@ import 'package:very_good_cli/src/commands/commands.dart';
 
 import '../../../../helpers/helpers.dart';
 
-class MockLogger extends Mock implements Logger {}
+class _MockLogger extends Mock implements Logger {}
 
-class MockMasonGenerator extends Mock implements MasonGenerator {}
+class _MockMasonGenerator extends Mock implements MasonGenerator {}
 
-class MockGeneratorHooks extends Mock implements GeneratorHooks {}
+class _MockProgress extends Mock implements Progress {}
 
-class MockArgResults extends Mock implements ArgResults {}
+class _MockGeneratorHooks extends Mock implements GeneratorHooks {}
 
-class FakeLogger extends Fake implements Logger {}
+class _MockArgResults extends Mock implements ArgResults {}
 
-class FakeDirectoryGeneratorTarget extends Fake
+class _FakeLogger extends Fake implements Logger {}
+
+class _FakeDirectoryGeneratorTarget extends Fake
     implements DirectoryGeneratorTarget {}
 
 final expectedUsage = [
@@ -46,14 +48,14 @@ void main() {
   late Logger logger;
 
   setUpAll(() {
-    registerFallbackValue(FakeDirectoryGeneratorTarget());
-    registerFallbackValue(FakeLogger());
+    registerFallbackValue(_FakeDirectoryGeneratorTarget());
+    registerFallbackValue(_FakeLogger());
   });
 
   setUp(() {
-    logger = MockLogger();
+    logger = _MockLogger();
 
-    final progress = MockProgress();
+    final progress = _MockProgress();
 
     when(() => logger.progress(any())).thenReturn(progress);
   });
@@ -104,8 +106,8 @@ void main() {
       late MasonGenerator generator;
 
       setUp(() {
-        hooks = MockGeneratorHooks();
-        generator = MockMasonGenerator();
+        hooks = _MockGeneratorHooks();
+        generator = _MockMasonGenerator();
 
         when(() => generator.hooks).thenReturn(hooks);
         when(
@@ -155,7 +157,7 @@ void main() {
         final tempDirectory = Directory.systemTemp.createTempSync();
         addTearDown(() => tempDirectory.deleteSync(recursive: true));
 
-        final argResults = MockArgResults();
+        final argResults = _MockArgResults();
         final command = CreateDartPackage(
           logger: logger,
           generatorFromBundle: (_) async => throw Exception('oops'),
diff --git a/test/src/commands/create/commands/docs_site_test.dart b/test/src/commands/create/commands/docs_site_test.dart
index 22129ac14..9471a613f 100644
--- a/test/src/commands/create/commands/docs_site_test.dart
+++ b/test/src/commands/create/commands/docs_site_test.dart
@@ -9,17 +9,19 @@ import 'package:very_good_cli/src/commands/commands.dart';
 
 import '../../../../helpers/helpers.dart';
 
-class MockLogger extends Mock implements Logger {}
+class _MockLogger extends Mock implements Logger {}
 
-class MockMasonGenerator extends Mock implements MasonGenerator {}
+class _MockProgress extends Mock implements Progress {}
 
-class MockGeneratorHooks extends Mock implements GeneratorHooks {}
+class _MockMasonGenerator extends Mock implements MasonGenerator {}
 
-class MockArgResults extends Mock implements ArgResults {}
+class _MockGeneratorHooks extends Mock implements GeneratorHooks {}
 
-class FakeLogger extends Fake implements Logger {}
+class _MockArgResults extends Mock implements ArgResults {}
 
-class FakeDirectoryGeneratorTarget extends Fake
+class _FakeLogger extends Fake implements Logger {}
+
+class _FakeDirectoryGeneratorTarget extends Fake
     implements DirectoryGeneratorTarget {}
 
 final expectedUsage = [
@@ -47,14 +49,14 @@ void main() {
   late Logger logger;
 
   setUpAll(() {
-    registerFallbackValue(FakeDirectoryGeneratorTarget());
-    registerFallbackValue(FakeLogger());
+    registerFallbackValue(_FakeDirectoryGeneratorTarget());
+    registerFallbackValue(_FakeLogger());
   });
 
   setUp(() {
-    logger = MockLogger();
+    logger = _MockLogger();
 
-    final progress = MockProgress();
+    final progress = _MockProgress();
 
     when(() => logger.progress(any())).thenReturn(progress);
   });
@@ -103,8 +105,8 @@ void main() {
       late MasonGenerator generator;
 
       setUp(() {
-        hooks = MockGeneratorHooks();
-        generator = MockMasonGenerator();
+        hooks = _MockGeneratorHooks();
+        generator = _MockMasonGenerator();
 
         when(() => generator.hooks).thenReturn(hooks);
         when(
@@ -154,7 +156,7 @@ void main() {
         final tempDirectory = Directory.systemTemp.createTempSync();
         addTearDown(() => tempDirectory.deleteSync(recursive: true));
 
-        final argResults = MockArgResults();
+        final argResults = _MockArgResults();
         final command = CreateDocsSite(
           logger: logger,
           generatorFromBundle: (_) async => throw Exception('oops'),
diff --git a/test/src/commands/create/commands/flame_game_test.dart b/test/src/commands/create/commands/flame_game_test.dart
index 3dac9e98c..5455663a4 100644
--- a/test/src/commands/create/commands/flame_game_test.dart
+++ b/test/src/commands/create/commands/flame_game_test.dart
@@ -10,17 +10,19 @@ import 'package:very_good_cli/src/commands/create/commands/flame_game.dart';
 
 import '../../../../helpers/helpers.dart';
 
-class MockLogger extends Mock implements Logger {}
+class _MockLogger extends Mock implements Logger {}
 
-class MockMasonGenerator extends Mock implements MasonGenerator {}
+class _MockProgress extends Mock implements Progress {}
 
-class MockGeneratorHooks extends Mock implements GeneratorHooks {}
+class _MockMasonGenerator extends Mock implements MasonGenerator {}
 
-class MockArgResults extends Mock implements ArgResults {}
+class _MockGeneratorHooks extends Mock implements GeneratorHooks {}
 
-class FakeLogger extends Fake implements Logger {}
+class _MockArgResults extends Mock implements ArgResults {}
 
-class FakeDirectoryGeneratorTarget extends Fake
+class _FakeLogger extends Fake implements Logger {}
+
+class _FakeDirectoryGeneratorTarget extends Fake
     implements DirectoryGeneratorTarget {}
 
 final expectedUsage = [
@@ -49,16 +51,16 @@ void main() {
   late Logger logger;
 
   setUpAll(() {
-    registerFallbackValue(FakeDirectoryGeneratorTarget());
-    registerFallbackValue(FakeLogger());
+    registerFallbackValue(_FakeDirectoryGeneratorTarget());
+    registerFallbackValue(_FakeLogger());
   });
 
   setUp(() {
     progressLogs = <String>[];
 
-    logger = MockLogger();
+    logger = _MockLogger();
 
-    final progress = MockProgress();
+    final progress = _MockProgress();
     when(() => progress.complete(any())).thenAnswer((_) {
       final message = _.positionalArguments.elementAt(0) as String?;
       if (message != null) progressLogs.add(message);
@@ -109,8 +111,8 @@ void main() {
       late MasonGenerator generator;
 
       setUp(() {
-        hooks = MockGeneratorHooks();
-        generator = MockMasonGenerator();
+        hooks = _MockGeneratorHooks();
+        generator = _MockMasonGenerator();
 
         when(() => generator.hooks).thenReturn(hooks);
         when(
@@ -160,7 +162,7 @@ void main() {
         final tempDirectory = Directory.systemTemp.createTempSync();
         addTearDown(() => tempDirectory.deleteSync(recursive: true));
 
-        final argResults = MockArgResults();
+        final argResults = _MockArgResults();
         final command = CreateFlameGame(
           logger: logger,
           generatorFromBundle: (_) async => throw Exception('oops'),
diff --git a/test/src/commands/create/commands/flutter_app_test.dart b/test/src/commands/create/commands/flutter_app_test.dart
index 4b723b4e2..4bde545db 100644
--- a/test/src/commands/create/commands/flutter_app_test.dart
+++ b/test/src/commands/create/commands/flutter_app_test.dart
@@ -9,15 +9,17 @@ import 'package:very_good_cli/src/commands/create/commands/flutter_app.dart';
 
 import '../../../../helpers/helpers.dart';
 
-class MockLogger extends Mock implements Logger {}
+class _MockLogger extends Mock implements Logger {}
 
-class MockMasonGenerator extends Mock implements MasonGenerator {}
+class _MockProgress extends Mock implements Progress {}
 
-class MockGeneratorHooks extends Mock implements GeneratorHooks {}
+class _MockMasonGenerator extends Mock implements MasonGenerator {}
 
-class FakeLogger extends Fake implements Logger {}
+class _MockGeneratorHooks extends Mock implements GeneratorHooks {}
 
-class FakeDirectoryGeneratorTarget extends Fake
+class _FakeLogger extends Fake implements Logger {}
+
+class _FakeDirectoryGeneratorTarget extends Fake
     implements DirectoryGeneratorTarget {}
 
 final expectedUsage = [
@@ -54,16 +56,16 @@ void main() {
   final generatedFiles = List.filled(10, const GeneratedFile.created(path: ''));
 
   setUpAll(() {
-    registerFallbackValue(FakeDirectoryGeneratorTarget());
-    registerFallbackValue(FakeLogger());
+    registerFallbackValue(_FakeDirectoryGeneratorTarget());
+    registerFallbackValue(_FakeLogger());
   });
 
   setUp(() {
     progressLogs = <String>[];
 
-    logger = MockLogger();
+    logger = _MockLogger();
 
-    final progress = MockProgress();
+    final progress = _MockProgress();
     when(() => progress.complete(any())).thenAnswer((_) {
       final message = _.positionalArguments.elementAt(0) as String?;
       if (message != null) progressLogs.add(message);
@@ -112,8 +114,8 @@ void main() {
       late MasonGenerator generator;
 
       setUp(() {
-        hooks = MockGeneratorHooks();
-        generator = MockMasonGenerator();
+        hooks = _MockGeneratorHooks();
+        generator = _MockMasonGenerator();
 
         when(() => generator.hooks).thenReturn(hooks);
         when(
diff --git a/test/src/commands/create/commands/flutter_package_test.dart b/test/src/commands/create/commands/flutter_package_test.dart
index f9d5f6e44..85ee3b90b 100644
--- a/test/src/commands/create/commands/flutter_package_test.dart
+++ b/test/src/commands/create/commands/flutter_package_test.dart
@@ -9,17 +9,19 @@ import 'package:very_good_cli/src/commands/commands.dart';
 
 import '../../../../helpers/helpers.dart';
 
-class MockLogger extends Mock implements Logger {}
+class _MockLogger extends Mock implements Logger {}
 
-class MockMasonGenerator extends Mock implements MasonGenerator {}
+class _MockProgress extends Mock implements Progress {}
 
-class MockGeneratorHooks extends Mock implements GeneratorHooks {}
+class _MockMasonGenerator extends Mock implements MasonGenerator {}
 
-class MockArgResults extends Mock implements ArgResults {}
+class _MockGeneratorHooks extends Mock implements GeneratorHooks {}
 
-class FakeLogger extends Fake implements Logger {}
+class _MockArgResults extends Mock implements ArgResults {}
 
-class FakeDirectoryGeneratorTarget extends Fake
+class _FakeLogger extends Fake implements Logger {}
+
+class _FakeDirectoryGeneratorTarget extends Fake
     implements DirectoryGeneratorTarget {}
 
 final expectedUsage = [
@@ -46,14 +48,14 @@ void main() {
   late Logger logger;
 
   setUpAll(() {
-    registerFallbackValue(FakeDirectoryGeneratorTarget());
-    registerFallbackValue(FakeLogger());
+    registerFallbackValue(_FakeDirectoryGeneratorTarget());
+    registerFallbackValue(_FakeLogger());
   });
 
   setUp(() {
-    logger = MockLogger();
+    logger = _MockLogger();
 
-    final progress = MockProgress();
+    final progress = _MockProgress();
 
     when(() => logger.progress(any())).thenReturn(progress);
   });
@@ -102,8 +104,8 @@ void main() {
       late MasonGenerator generator;
 
       setUp(() {
-        hooks = MockGeneratorHooks();
-        generator = MockMasonGenerator();
+        hooks = _MockGeneratorHooks();
+        generator = _MockMasonGenerator();
 
         when(() => generator.hooks).thenReturn(hooks);
         when(
@@ -153,7 +155,7 @@ void main() {
         final tempDirectory = Directory.systemTemp.createTempSync();
         addTearDown(() => tempDirectory.deleteSync(recursive: true));
 
-        final argResults = MockArgResults();
+        final argResults = _MockArgResults();
         final command = CreateFlutterPackage(
           logger: logger,
           generatorFromBundle: (_) async => throw Exception('oops'),
diff --git a/test/src/commands/create/commands/flutter_plugin_test.dart b/test/src/commands/create/commands/flutter_plugin_test.dart
index 5f5176a5e..cd41aa94a 100644
--- a/test/src/commands/create/commands/flutter_plugin_test.dart
+++ b/test/src/commands/create/commands/flutter_plugin_test.dart
@@ -9,17 +9,19 @@ import 'package:very_good_cli/src/commands/commands.dart';
 
 import '../../../../helpers/helpers.dart';
 
-class MockLogger extends Mock implements Logger {}
+class _MockLogger extends Mock implements Logger {}
 
-class MockMasonGenerator extends Mock implements MasonGenerator {}
+class _MockProgress extends Mock implements Progress {}
 
-class MockGeneratorHooks extends Mock implements GeneratorHooks {}
+class _MockMasonGenerator extends Mock implements MasonGenerator {}
 
-class MockArgResults extends Mock implements ArgResults {}
+class _MockGeneratorHooks extends Mock implements GeneratorHooks {}
 
-class FakeLogger extends Fake implements Logger {}
+class _MockArgResults extends Mock implements ArgResults {}
 
-class FakeDirectoryGeneratorTarget extends Fake
+class _FakeLogger extends Fake implements Logger {}
+
+class _FakeDirectoryGeneratorTarget extends Fake
     implements DirectoryGeneratorTarget {}
 
 final expectedUsage = [
@@ -56,14 +58,14 @@ void main() {
   late Logger logger;
 
   setUpAll(() {
-    registerFallbackValue(FakeDirectoryGeneratorTarget());
-    registerFallbackValue(FakeLogger());
+    registerFallbackValue(_FakeDirectoryGeneratorTarget());
+    registerFallbackValue(_FakeLogger());
   });
 
   setUp(() {
-    logger = MockLogger();
+    logger = _MockLogger();
 
-    final progress = MockProgress();
+    final progress = _MockProgress();
 
     when(() => logger.progress(any())).thenReturn(progress);
   });
@@ -115,8 +117,8 @@ void main() {
       late MasonGenerator generator;
 
       setUp(() {
-        hooks = MockGeneratorHooks();
-        generator = MockMasonGenerator();
+        hooks = _MockGeneratorHooks();
+        generator = _MockMasonGenerator();
 
         when(() => generator.hooks).thenReturn(hooks);
         when(
@@ -166,7 +168,7 @@ void main() {
         final tempDirectory = Directory.systemTemp.createTempSync();
         addTearDown(() => tempDirectory.deleteSync(recursive: true));
 
-        final argResults = MockArgResults();
+        final argResults = _MockArgResults();
         final command = CreateFlutterPlugin(
           logger: logger,
           generatorFromBundle: (_) async => throw Exception('oops'),
diff --git a/test/src/commands/create/create_subcommand_test.dart b/test/src/commands/create/create_subcommand_test.dart
index de0d3d07f..e1178279b 100644
--- a/test/src/commands/create/create_subcommand_test.dart
+++ b/test/src/commands/create/create_subcommand_test.dart
@@ -8,24 +8,24 @@ import 'package:test/test.dart';
 import 'package:very_good_cli/src/commands/create/commands/create_subcommand.dart';
 import 'package:very_good_cli/src/commands/create/templates/template.dart';
 
-class MockTemplate extends Mock implements Template {}
+class _MockTemplate extends Mock implements Template {}
 
-class MockLogger extends Mock implements Logger {}
+class _MockLogger extends Mock implements Logger {}
 
-class MockProgress extends Mock implements Progress {}
+class _MockProgress extends Mock implements Progress {}
 
-class MockMasonGenerator extends Mock implements MasonGenerator {}
+class _MockMasonGenerator extends Mock implements MasonGenerator {}
 
-class MockBundle extends Mock implements MasonBundle {}
+class _MockBundle extends Mock implements MasonBundle {}
 
-class MockGeneratorHooks extends Mock implements GeneratorHooks {}
+class _MockGeneratorHooks extends Mock implements GeneratorHooks {}
 
-class FakeLogger extends Fake implements Logger {}
+class _FakeLogger extends Fake implements Logger {}
 
-class FakeDirectoryGeneratorTarget extends Fake
+class _FakeDirectoryGeneratorTarget extends Fake
     implements DirectoryGeneratorTarget {}
 
-class FakeDirectory extends Fake implements Directory {}
+class _FakeDirectory extends Fake implements Directory {}
 
 class _TestCreateSubCommand extends CreateSubCommand {
   _TestCreateSubCommand({
@@ -102,17 +102,17 @@ void main() {
   late Progress progress;
 
   setUpAll(() {
-    registerFallbackValue(FakeDirectoryGeneratorTarget());
-    registerFallbackValue(FakeLogger());
-    registerFallbackValue(FakeDirectory());
+    registerFallbackValue(_FakeDirectoryGeneratorTarget());
+    registerFallbackValue(_FakeLogger());
+    registerFallbackValue(_FakeDirectory());
   });
 
   setUp(() {
     progressLogs = <String>[];
 
-    logger = MockLogger();
+    logger = _MockLogger();
 
-    progress = MockProgress();
+    progress = _MockProgress();
     when(() => progress.complete(any())).thenAnswer((_) {
       final message = _.positionalArguments.elementAt(0) as String?;
       if (message != null) progressLogs.add(message);
@@ -131,14 +131,14 @@ Usage: very_good create create_subcommand <project-name> [arguments]
 Run "runner help" to see global options.''';
 
     late Template template;
-    late MockBundle bundle;
+    late _MockBundle bundle;
 
     setUp(() {
-      bundle = MockBundle();
+      bundle = _MockBundle();
       when(() => bundle.name).thenReturn('test');
       when(() => bundle.description).thenReturn('Test bundle');
       when(() => bundle.version).thenReturn('<bundleversion>');
-      template = MockTemplate();
+      template = _MockTemplate();
       when(() => template.name).thenReturn('test');
       when(() => template.bundle).thenReturn(bundle);
       when(() => template.onGenerateComplete(any(), any())).thenAnswer(
@@ -184,8 +184,8 @@ Run "runner help" to see global options.''';
       late _TestCommandRunner runner;
 
       setUp(() {
-        hooks = MockGeneratorHooks();
-        generator = MockMasonGenerator();
+        hooks = _MockGeneratorHooks();
+        generator = _MockMasonGenerator();
 
         when(() => generator.hooks).thenReturn(hooks);
         when(
@@ -516,14 +516,14 @@ Usage: very_good create create_subcommand <project-name> [arguments]
 Run "runner help" to see global options.''';
 
     late Template template;
-    late MockBundle bundle;
+    late _MockBundle bundle;
 
     setUp(() {
-      bundle = MockBundle();
+      bundle = _MockBundle();
       when(() => bundle.name).thenReturn('test');
       when(() => bundle.description).thenReturn('Test bundle');
       when(() => bundle.version).thenReturn('<bundleversion>');
-      template = MockTemplate();
+      template = _MockTemplate();
       when(() => template.name).thenReturn('test');
       when(() => template.bundle).thenReturn(bundle);
       when(() => template.onGenerateComplete(any(), any())).thenAnswer(
@@ -566,8 +566,8 @@ Run "runner help" to see global options.''';
       late _TestCommandRunner runner;
 
       setUp(() {
-        hooks = MockGeneratorHooks();
-        generator = MockMasonGenerator();
+        hooks = _MockGeneratorHooks();
+        generator = _MockMasonGenerator();
 
         when(() => generator.hooks).thenReturn(hooks);
         when(
@@ -854,16 +854,16 @@ Usage: very_good create create_subcommand <project-name> [arguments]
 
 Run "runner help" to see global options.''';
 
-    late MockBundle bundle;
+    late _MockBundle bundle;
     late List<Template> templates;
 
     setUp(() {
-      bundle = MockBundle();
+      bundle = _MockBundle();
       when(() => bundle.name).thenReturn('test');
       when(() => bundle.description).thenReturn('Test bundle');
       when(() => bundle.version).thenReturn('<bundleversion>');
 
-      final template1 = MockTemplate();
+      final template1 = _MockTemplate();
       when(() => template1.name).thenReturn('template1');
       when(() => template1.help).thenReturn('template1 help');
       when(() => template1.bundle).thenReturn(bundle);
@@ -871,7 +871,7 @@ Run "runner help" to see global options.''';
         (_) async {},
       );
 
-      final template2 = MockTemplate();
+      final template2 = _MockTemplate();
       when(() => template2.name).thenReturn('template2');
       when(() => template2.help).thenReturn('template2 help');
       when(() => template2.bundle).thenReturn(bundle);
@@ -923,8 +923,8 @@ Run "runner help" to see global options.''';
       late _TestCommandRunner runner;
 
       setUp(() {
-        hooks = MockGeneratorHooks();
-        generator = MockMasonGenerator();
+        hooks = _MockGeneratorHooks();
+        generator = _MockMasonGenerator();
 
         when(() => generator.hooks).thenReturn(hooks);
         when(
@@ -1039,14 +1039,14 @@ Usage: very_good create create_subcommand <project-name> [arguments]
 Run "runner help" to see global options.''';
 
     late Template template;
-    late MockBundle bundle;
+    late _MockBundle bundle;
 
     setUp(() {
-      bundle = MockBundle();
+      bundle = _MockBundle();
       when(() => bundle.name).thenReturn('test');
       when(() => bundle.description).thenReturn('Test bundle');
       when(() => bundle.version).thenReturn('<bundleversion>');
-      template = MockTemplate();
+      template = _MockTemplate();
       when(() => template.name).thenReturn('test');
       when(() => template.bundle).thenReturn(bundle);
       when(() => template.onGenerateComplete(any(), any())).thenAnswer(
@@ -1081,8 +1081,8 @@ Run "runner help" to see global options.''';
       late _TestCommandRunner runner;
 
       setUp(() {
-        hooks = MockGeneratorHooks();
-        generator = MockMasonGenerator();
+        hooks = _MockGeneratorHooks();
+        generator = _MockMasonGenerator();
 
         when(() => generator.hooks).thenReturn(hooks);
         when(
diff --git a/test/src/commands/test/test_test.dart b/test/src/commands/test/test_test.dart
index 0125cea2f..046c9567e 100644
--- a/test/src/commands/test/test_test.dart
+++ b/test/src/commands/test/test_test.dart
@@ -10,6 +10,12 @@ import 'package:very_good_cli/src/commands/test/test.dart';
 
 import '../../../helpers/helpers.dart';
 
+class _MockLogger extends Mock implements Logger {}
+
+class _MockArgResults extends Mock implements ArgResults {}
+
+class _MockFlutterTestCommand extends Mock implements FlutterTestCommand {}
+
 const expectedTestUsage = [
   // ignore: no_adjacent_strings_in_list
   'Run tests in a Dart or Flutter project.\n'
@@ -52,12 +58,6 @@ abstract class FlutterTestCommand {
   });
 }
 
-class MockLogger extends Mock implements Logger {}
-
-class MockArgResults extends Mock implements ArgResults {}
-
-class MockFlutterTestCommand extends Mock implements FlutterTestCommand {}
-
 void main() {
   group('test', () {
     final cwd = Directory.current;
@@ -71,10 +71,10 @@ void main() {
     late TestCommand testCommand;
 
     setUp(() {
-      logger = MockLogger();
+      logger = _MockLogger();
       isFlutterInstalled = true;
-      argResults = MockArgResults();
-      flutterTest = MockFlutterTestCommand();
+      argResults = _MockArgResults();
+      flutterTest = _MockFlutterTestCommand();
       testCommand = TestCommand(
         logger: logger,
         flutterInstalled: ({required Logger logger}) async =>
diff --git a/test/src/commands/update_test.dart b/test/src/commands/update_test.dart
index 545b5166e..6bbf2717f 100644
--- a/test/src/commands/update_test.dart
+++ b/test/src/commands/update_test.dart
@@ -8,6 +8,8 @@ import 'package:very_good_cli/src/version.dart';
 
 import '../../helpers/helpers.dart';
 
+class _MockProgress extends Mock implements Progress {}
+
 void main() {
   const latestVersion = '0.0.0';
   final successProcessResult = ProcessResult(
@@ -121,7 +123,7 @@ void main() {
           ),
         ).thenAnswer((_) => Future.value(successProcessResult));
 
-        when(() => logger.progress(any())).thenReturn(MockProgress());
+        when(() => logger.progress(any())).thenReturn(_MockProgress());
         final result = await commandRunner.run(['update']);
         expect(result, equals(ExitCode.success.code));
         verify(() => logger.progress('Checking for updates')).called(1);
@@ -141,7 +143,7 @@ void main() {
         when(
           () => pubUpdater.getLatestVersion(any()),
         ).thenAnswer((_) async => packageVersion);
-        when(() => logger.progress(any())).thenReturn(MockProgress());
+        when(() => logger.progress(any())).thenReturn(_MockProgress());
         final result = await commandRunner.run(['update']);
         expect(result, equals(ExitCode.success.code));
         verify(