diff --git a/test/providers/terminal_providers_test.dart b/test/providers/terminal_providers_test.dart
index ce9e27ce..8719ee3e 100644
--- a/test/providers/terminal_providers_test.dart
+++ b/test/providers/terminal_providers_test.dart
@@ -1,8 +1,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:apidash/providers/terminal_providers.dart';
-import 'package:apidash/models/terminal/models.dart';
-import 'package:apidash/consts.dart';
+import 'package:apidash/terminal/terminal.dart';
 import 'package:apidash_core/apidash_core.dart';
 
 void main() {
diff --git a/test/screens/terminal/terminal_page_test.dart b/test/screens/terminal/terminal_page_test.dart
index 5a734d4d..0b7c9b9c 100644
--- a/test/screens/terminal/terminal_page_test.dart
+++ b/test/screens/terminal/terminal_page_test.dart
@@ -4,10 +4,9 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:apidash/screens/terminal/terminal_page.dart';
 import 'package:apidash/providers/terminal_providers.dart';
 import 'package:apidash_core/apidash_core.dart';
-import 'package:apidash/consts.dart';
-import 'package:apidash/widgets/terminal_level_filter_menu.dart';
 import 'package:apidash/models/request_model.dart';
 import 'package:apidash/providers/collection_providers.dart';
+import 'package:apidash/terminal/terminal.dart';
 import '../../providers/helpers.dart';
 
 void main() {
diff --git a/test/widgets/terminal_level_filter_menu_test.dart b/test/terminal/terminal_level_filter_menu_test.dart
similarity index 92%
rename from test/widgets/terminal_level_filter_menu_test.dart
rename to test/terminal/terminal_level_filter_menu_test.dart
index 87687c99..b5a0ddf4 100644
--- a/test/widgets/terminal_level_filter_menu_test.dart
+++ b/test/terminal/terminal_level_filter_menu_test.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:apidash/widgets/terminal_level_filter_menu.dart';
-import 'package:apidash/consts.dart';
+import 'package:apidash/terminal/enums.dart';
+import 'package:apidash/terminal/widgets/terminal_level_filter_menu.dart';
 
 void main() {
   testWidgets('TerminalLevelFilterMenu toggles and bulk selects',
diff --git a/test/models/terminal_models_test.dart b/test/terminal/terminal_models_test.dart
similarity index 97%
rename from test/models/terminal_models_test.dart
rename to test/terminal/terminal_models_test.dart
index f673aabd..786ccdaf 100644
--- a/test/models/terminal_models_test.dart
+++ b/test/terminal/terminal_models_test.dart
@@ -1,7 +1,7 @@
 import 'package:test/test.dart';
-import 'package:apidash/consts.dart';
-import 'package:apidash/models/terminal/models.dart';
 import 'package:apidash_core/apidash_core.dart';
+import 'package:apidash/terminal/models/models.dart';
+import 'package:apidash/terminal/enums.dart';
 
 void main() {
   group('TerminalEntry model', () {
diff --git a/test/widgets/terminal_tiles_test.dart b/test/terminal/terminal_tiles_test.dart
similarity index 97%
rename from test/widgets/terminal_tiles_test.dart
rename to test/terminal/terminal_tiles_test.dart
index 0648c8d3..c1dabc63 100644
--- a/test/widgets/terminal_tiles_test.dart
+++ b/test/terminal/terminal_tiles_test.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:apidash/widgets/terminal_tiles.dart';
-import 'package:apidash/models/terminal/models.dart';
-import 'package:apidash/consts.dart';
 import 'package:apidash_core/apidash_core.dart';
+import 'package:apidash/terminal/enums.dart';
+import 'package:apidash/terminal/models/models.dart';
+import 'package:apidash/terminal/widgets/widgets.dart';
 
 void main() {
   testWidgets('SystemLogTile renders message and optional stack',
diff --git a/test/widgets/highlight_text_test.dart b/test/widgets/text_highlighted_selectable_test.dart
similarity index 98%
rename from test/widgets/highlight_text_test.dart
rename to test/widgets/text_highlighted_selectable_test.dart
index 1a4306fe..f88b561b 100644
--- a/test/widgets/highlight_text_test.dart
+++ b/test/widgets/text_highlighted_selectable_test.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:apidash/widgets/highlight_text.dart';
+import 'package:apidash/widgets/text_highlighted_selectable.dart';
 
 void main() {
   testWidgets('HighlightedSelectableText renders plain text when no query',