diff --git a/lib/widgets/nutrition/nutrition_tiles.dart b/lib/widgets/nutrition/nutrition_tiles.dart
index dc23fbff..304ef9f3 100644
--- a/lib/widgets/nutrition/nutrition_tiles.dart
+++ b/lib/widgets/nutrition/nutrition_tiles.dart
@@ -32,10 +32,7 @@ class MealItemValuesTile extends StatelessWidget {
       trailing: IconButton(
         icon: const Icon(Icons.info_outline),
         onPressed: () {
-          showIngredientDetails(
-            context,
-            ingredient.id,
-          );
+          showIngredientDetails(context, ingredient.id);
         },
       ),
     );
diff --git a/test/exercises/exercise_provider_load_test.dart b/test/exercises/exercise_provider_load_test.dart
index bc809b5c..7123cba7 100644
--- a/test/exercises/exercise_provider_load_test.dart
+++ b/test/exercises/exercise_provider_load_test.dart
@@ -54,12 +54,8 @@ void main() {
     provider.languages = [tLanguage1, tLanguage2, tLanguage3];
 
     // Mock base info response
-    when(
-      mockBaseProvider.makeUrl(exerciseBaseInfoUrl, id: 9),
-    ).thenReturn(tExerciseBaseInfoUri);
-    when(
-      mockBaseProvider.makeUrl(exerciseBaseInfoUrl, id: 1),
-    ).thenReturn(tExerciseBaseInfoUri2);
+    when(mockBaseProvider.makeUrl(exerciseBaseInfoUrl, id: 9)).thenReturn(tExerciseBaseInfoUri);
+    when(mockBaseProvider.makeUrl(exerciseBaseInfoUrl, id: 1)).thenReturn(tExerciseBaseInfoUri2);
 
     when(mockBaseProvider.fetch(tExerciseBaseInfoUri))
         .thenAnswer((_) => Future.value(tExerciseInfoMap));
diff --git a/test/exercises/exercise_provider_test.dart b/test/exercises/exercise_provider_test.dart
index 0170a3fe..5a24bf43 100644
--- a/test/exercises/exercise_provider_test.dart
+++ b/test/exercises/exercise_provider_test.dart
@@ -236,10 +236,7 @@ void main() {
         // assert
         verifyNever(provider.baseProvider.fetch(tSearchByNameUri));
 
-        expect(
-          provider.filteredExercises,
-          data.getTestExercises(),
-        );
+        expect(provider.filteredExercises, data.getTestExercises());
       });
 
       test('A muscle is selected with no search term. Should find results', () async {
diff --git a/test/exercises/exercises_detail_widget_test.dart b/test/exercises/exercises_detail_widget_test.dart
index 12e98ba0..d40dd857 100644
--- a/test/exercises/exercises_detail_widget_test.dart
+++ b/test/exercises/exercises_detail_widget_test.dart
@@ -37,9 +37,7 @@ void main() {
         localizationsDelegates: AppLocalizations.localizationsDelegates,
         supportedLocales: AppLocalizations.supportedLocales,
         navigatorKey: GlobalKey<NavigatorState>(),
-        home: Scaffold(
-          body: ExerciseDetail(getTestExercises()[0]),
-        ),
+        home: Scaffold(body: ExerciseDetail(getTestExercises()[0])),
       ),
     );
   }
diff --git a/test/gallery/gallery_form_test.dart b/test/gallery/gallery_form_test.dart
index fcf26cf7..6fdc69e0 100644
--- a/test/gallery/gallery_form_test.dart
+++ b/test/gallery/gallery_form_test.dart
@@ -46,9 +46,7 @@ void main() {
         locale: Locale(locale),
         localizationsDelegates: AppLocalizations.localizationsDelegates,
         supportedLocales: AppLocalizations.supportedLocales,
-        home: Scaffold(
-          body: useImage ? ImageForm(image) : ImageForm(),
-        ),
+        home: Scaffold(body: useImage ? ImageForm(image) : ImageForm()),
       ),
     );
   }
diff --git a/test/gallery/gallery_screen_test.dart b/test/gallery/gallery_screen_test.dart
index 848aeeb9..0f796ab1 100644
--- a/test/gallery/gallery_screen_test.dart
+++ b/test/gallery/gallery_screen_test.dart
@@ -48,9 +48,7 @@ void main() {
         localizationsDelegates: AppLocalizations.localizationsDelegates,
         supportedLocales: AppLocalizations.supportedLocales,
         home: const Gallery(),
-        routes: {
-          FormScreen.routeName: (ctx) => const FormScreen(),
-        },
+        routes: {FormScreen.routeName: (ctx) => const FormScreen()},
       ),
     );
   }
diff --git a/test/nutrition/nutritional_meal_form_test.dart b/test/nutrition/nutritional_meal_form_test.dart
index 8d25f6c0..fdb781f6 100644
--- a/test/nutrition/nutritional_meal_form_test.dart
+++ b/test/nutrition/nutritional_meal_form_test.dart
@@ -60,9 +60,7 @@ void main() {
         localizationsDelegates: AppLocalizations.localizationsDelegates,
         supportedLocales: AppLocalizations.supportedLocales,
         navigatorKey: key,
-        home: Scaffold(
-          body: MealForm(1, meal),
-        ),
+        home: Scaffold(body: MealForm(1, meal)),
         routes: {
           NutritionalPlanScreen.routeName: (ctx) => const NutritionalPlanScreen(),
         },
diff --git a/test/nutrition/nutritional_plan_form_test.dart b/test/nutrition/nutritional_plan_form_test.dart
index 0eb990fc..e366ef51 100644
--- a/test/nutrition/nutritional_plan_form_test.dart
+++ b/test/nutrition/nutritional_plan_form_test.dart
@@ -58,9 +58,7 @@ void main() {
         localizationsDelegates: AppLocalizations.localizationsDelegates,
         supportedLocales: AppLocalizations.supportedLocales,
         navigatorKey: key,
-        home: Scaffold(
-          body: PlanForm(plan),
-        ),
+        home: Scaffold(body: PlanForm(plan)),
         routes: {
           NutritionalPlanScreen.routeName: (ctx) => const NutritionalPlanScreen(),
         },
diff --git a/test/nutrition/nutritional_plan_screen_test.dart b/test/nutrition/nutritional_plan_screen_test.dart
index 563ac86f..f9a5b45b 100644
--- a/test/nutrition/nutritional_plan_screen_test.dart
+++ b/test/nutrition/nutritional_plan_screen_test.dart
@@ -72,13 +72,9 @@ void main() {
       await loadAppFonts();
       final globalKey = GlobalKey();
       await tester.pumpWidgetBuilder(
-        Material(
-          key: globalKey,
-        ),
+        Material(key: globalKey),
         wrapper: materialAppWrapper(
-          localizations: [
-            AppLocalizations.delegate,
-          ],
+          localizations: [AppLocalizations.delegate],
         ),
         surfaceSize: const Size(500, 1000),
       );
diff --git a/test/nutrition/nutritional_plans_screen_test.dart b/test/nutrition/nutritional_plans_screen_test.dart
index 697f4d21..2ba4dbac 100644
--- a/test/nutrition/nutritional_plans_screen_test.dart
+++ b/test/nutrition/nutritional_plans_screen_test.dart
@@ -40,10 +40,8 @@ void main() {
   final client = MockClient();
 
   Widget createHomeScreen({locale = 'en'}) {
-    when(client.delete(
-      any,
-      headers: anyNamed('headers'),
-    )).thenAnswer((_) async => http.Response('', 200));
+    when(client.delete(any, headers: anyNamed('headers')))
+        .thenAnswer((_) async => http.Response('', 200));
 
     when(mockBaseProvider.deleteRequest(any, any)).thenAnswer(
       (_) async => http.Response('', 200),
@@ -74,9 +72,7 @@ void main() {
         localizationsDelegates: AppLocalizations.localizationsDelegates,
         supportedLocales: AppLocalizations.supportedLocales,
         home: const NutritionalPlansScreen(),
-        routes: {
-          FormScreen.routeName: (ctx) => const FormScreen(),
-        },
+        routes: {FormScreen.routeName: (ctx) => const FormScreen()},
       ),
     );
   }
diff --git a/test/weight/weight_form_test.dart b/test/weight/weight_form_test.dart
index e8402869..7c81ef7e 100644
--- a/test/weight/weight_form_test.dart
+++ b/test/weight/weight_form_test.dart
@@ -30,9 +30,7 @@ void main() {
       locale: Locale(locale),
       localizationsDelegates: AppLocalizations.localizationsDelegates,
       supportedLocales: AppLocalizations.supportedLocales,
-      home: Scaffold(
-        body: WeightForm(weightEntry),
-      ),
+      home: Scaffold(body: WeightForm(weightEntry)),
     );
   }
 
diff --git a/test/weight/weight_screen_test.dart b/test/weight/weight_screen_test.dart
index 8dbe640c..fcebe260 100644
--- a/test/weight/weight_screen_test.dart
+++ b/test/weight/weight_screen_test.dart
@@ -65,9 +65,7 @@ void main() {
             localizationsDelegates: AppLocalizations.localizationsDelegates,
             supportedLocales: AppLocalizations.supportedLocales,
             home: const WeightScreen(),
-            routes: {
-              FormScreen.routeName: (_) => const FormScreen(),
-            },
+            routes: {FormScreen.routeName: (_) => const FormScreen()},
           ),
         ),
       ),
diff --git a/test/workout/repetition_unit_form_widget_test.dart b/test/workout/repetition_unit_form_widget_test.dart
index 5e250bd7..42386007 100644
--- a/test/workout/repetition_unit_form_widget_test.dart
+++ b/test/workout/repetition_unit_form_widget_test.dart
@@ -64,9 +64,7 @@ void main() {
         localizationsDelegates: AppLocalizations.localizationsDelegates,
         supportedLocales: AppLocalizations.supportedLocales,
         navigatorKey: key,
-        home: Scaffold(
-          body: RepetitionUnitInputWidget(setting1),
-        ),
+        home: Scaffold(body: RepetitionUnitInputWidget(setting1)),
         routes: {
           WorkoutPlanScreen.routeName: (ctx) => const WorkoutPlanScreen(),
         },
diff --git a/test/workout/weight_unit_form_widget_test.dart b/test/workout/weight_unit_form_widget_test.dart
index 4b564383..ed68f044 100644
--- a/test/workout/weight_unit_form_widget_test.dart
+++ b/test/workout/weight_unit_form_widget_test.dart
@@ -65,9 +65,7 @@ void main() {
         localizationsDelegates: AppLocalizations.localizationsDelegates,
         supportedLocales: AppLocalizations.supportedLocales,
         navigatorKey: key,
-        home: Scaffold(
-          body: WeightUnitInputWidget(setting1),
-        ),
+        home: Scaffold(body: WeightUnitInputWidget(setting1)),
         routes: {
           WorkoutPlanScreen.routeName: (ctx) => const WorkoutPlanScreen(),
         },
diff --git a/test/workout/workout_day_form_test.dart b/test/workout/workout_day_form_test.dart
index 99e321e9..ef466062 100644
--- a/test/workout/workout_day_form_test.dart
+++ b/test/workout/workout_day_form_test.dart
@@ -51,9 +51,7 @@ void main() {
         localizationsDelegates: AppLocalizations.localizationsDelegates,
         supportedLocales: AppLocalizations.supportedLocales,
         navigatorKey: key,
-        home: Scaffold(
-          body: DayFormWidget(workoutPlan),
-        ),
+        home: Scaffold(body: DayFormWidget(workoutPlan)),
       ),
     );
   }
diff --git a/test/workout/workout_form_test.dart b/test/workout/workout_form_test.dart
index a3ddd7f4..7528c09f 100644
--- a/test/workout/workout_form_test.dart
+++ b/test/workout/workout_form_test.dart
@@ -59,9 +59,7 @@ void main() {
         localizationsDelegates: AppLocalizations.localizationsDelegates,
         supportedLocales: AppLocalizations.supportedLocales,
         navigatorKey: key,
-        home: Scaffold(
-          body: WorkoutForm(workoutPlan),
-        ),
+        home: Scaffold(body: WorkoutForm(workoutPlan)),
         routes: {
           WorkoutPlanScreen.routeName: (ctx) => const WorkoutPlanScreen(),
         },
diff --git a/test/workout/workout_plans_screen_test.dart b/test/workout/workout_plans_screen_test.dart
index 993eb9a6..ebc8095b 100644
--- a/test/workout/workout_plans_screen_test.dart
+++ b/test/workout/workout_plans_screen_test.dart
@@ -71,9 +71,7 @@ void main() {
         localizationsDelegates: AppLocalizations.localizationsDelegates,
         supportedLocales: AppLocalizations.supportedLocales,
         home: const WorkoutPlansScreen(),
-        routes: {
-          FormScreen.routeName: (ctx) => const FormScreen(),
-        },
+        routes: {FormScreen.routeName: (ctx) => const FormScreen()},
       ),
     );
   }
diff --git a/test/workout/workout_provider_test.dart b/test/workout/workout_provider_test.dart
index 1bcb7d4f..d6a17e4e 100644
--- a/test/workout/workout_provider_test.dart
+++ b/test/workout/workout_provider_test.dart
@@ -51,9 +51,7 @@ void main() {
 
       final uri = Uri.https('localhost', 'api/v2/workout/325397/');
       when(mockBaseProvider.makeUrl('workout', id: 325397)).thenReturn(uri);
-      when(mockBaseProvider.fetch(
-        uri,
-      )).thenAnswer(
+      when(mockBaseProvider.fetch(uri)).thenAnswer(
         (_) async => Future.value({
           'id': 325397,
           'name': 'Test workout',
@@ -78,9 +76,7 @@ void main() {
       final exercisesProvider = ExercisesProvider(mockBaseProvider);
       final uri = Uri.https('localhost', 'api/v2/workout/325397/');
       when(mockBaseProvider.makeUrl('workout', id: 325397)).thenReturn(uri);
-      when(mockBaseProvider.fetch(
-        uri,
-      )).thenAnswer(
+      when(mockBaseProvider.fetch(uri)).thenAnswer(
         (_) async => Future.value({
           'id': 325397,
           'name': 'Test workout',
diff --git a/test/workout/workout_set_form_test.dart b/test/workout/workout_set_form_test.dart
index 50479298..08961854 100644
--- a/test/workout/workout_set_form_test.dart
+++ b/test/workout/workout_set_form_test.dart
@@ -63,9 +63,7 @@ void main() {
           localizationsDelegates: AppLocalizations.localizationsDelegates,
           supportedLocales: AppLocalizations.supportedLocales,
           navigatorKey: GlobalKey<NavigatorState>(),
-          home: Scaffold(
-            body: SetFormWidget(day),
-          ),
+          home: Scaffold(body: SetFormWidget(day)),
         ),
       ),
     );
@@ -90,9 +88,7 @@ void main() {
       any,
       languageCode: anyNamed('languageCode'),
       searchEnglish: anyNamed('searchEnglish'),
-    )).thenAnswer(
-      (_) => Future.value([getTestExercises().first]),
-    );
+    )).thenAnswer((_) => Future.value([getTestExercises().first]));
 
     await tester.pumpWidget(createHomeScreen());
     await tester.pumpAndSettle();
diff --git a/test_data/nutritional_plans.dart b/test_data/nutritional_plans.dart
index 5e77e792..1b3a42cc 100644
--- a/test_data/nutritional_plans.dart
+++ b/test_data/nutritional_plans.dart
@@ -146,22 +146,13 @@ final cake = Ingredient(
 );
 
 NutritionalPlan getNutritionalPlan() {
-  final mealItem1 = MealItem(
-    ingredientId: 1,
-    amount: 100,
-  );
+  final mealItem1 = MealItem(ingredientId: 1, amount: 100);
   mealItem1.ingredient = ingredient1;
 
-  final mealItem2 = MealItem(
-    ingredientId: 2,
-    amount: 75,
-  );
+  final mealItem2 = MealItem(ingredientId: 2, amount: 75);
   mealItem2.ingredient = ingredient2;
 
-  final mealItem3 = MealItem(
-    ingredientId: 3,
-    amount: 300,
-  );
+  final mealItem3 = MealItem(ingredientId: 3, amount: 300);
   mealItem3.ingredient = ingredient3;
 
   final meal1 = Meal(
diff --git a/test_data/screenshots_exercises.dart b/test_data/screenshots_exercises.dart
index 743474bc..a801bd59 100644
--- a/test_data/screenshots_exercises.dart
+++ b/test_data/screenshots_exercises.dart
@@ -2,86 +2,34 @@
 import 'package:wger/models/exercises/language.dart';
 import 'package:wger/models/exercises/translation.dart';
 
-const tLanguage21 = Language(
-  id: 21,
-  shortName: 'he',
-  fullName: 'עברית',
-);
-const tLanguage5 = Language(
-  id: 5,
-  shortName: 'ru',
-  fullName: 'Русский',
-);
-const tLanguage16 = Language(
-  id: 16,
-  shortName: 'tr',
-  fullName: 'Türkçe',
-);
+const tLanguage21 = Language(id: 21, shortName: 'he', fullName: 'עברית');
+const tLanguage5 = Language(id: 5, shortName: 'ru', fullName: 'Русский');
+const tLanguage16 = Language(id: 16, shortName: 'tr', fullName: 'Türkçe');
 const tLanguage22 = Language(
   id: 22,
   shortName: 'hr',
   fullName: 'Hrvatski jezik',
 );
-const tLanguage9 = Language(
-  id: 9,
-  shortName: 'cs',
-  fullName: 'Čeština',
-);
-const tLanguage4 = Language(
-  id: 4,
-  shortName: 'es',
-  fullName: 'Español',
-);
-const tLanguage24 = Language(
-  id: 24,
-  shortName: 'zh',
-  fullName: '漢語',
-);
+const tLanguage9 = Language(id: 9, shortName: 'cs', fullName: 'Čeština');
+const tLanguage4 = Language(id: 4, shortName: 'es', fullName: 'Español');
+const tLanguage24 = Language(id: 24, shortName: 'zh', fullName: '漢語');
 const tLanguage17 = Language(
   id: 17,
   shortName: 'ar',
   fullName: 'اَللُّغَةُ اَلْعَرَبِيَّة',
 );
-const tLanguage8 = Language(
-  id: 8,
-  shortName: 'el',
-  fullName: 'Ελληνικά',
-);
-const tLanguage2 = Language(
-  id: 2,
-  shortName: 'en',
-  fullName: 'English',
-);
-const tLanguage13 = Language(
-  id: 13,
-  shortName: 'it',
-  fullName: 'Italian',
-);
-const tLanguage12 = Language(
-  id: 12,
-  shortName: 'fr',
-  fullName: 'Français',
-);
-const tLanguage1 = Language(
-  id: 1,
-  shortName: 'de',
-  fullName: 'Deutsch',
-);
+const tLanguage8 = Language(id: 8, shortName: 'el', fullName: 'Ελληνικά');
+const tLanguage2 = Language(id: 2, shortName: 'en', fullName: 'English');
+const tLanguage13 = Language(id: 13, shortName: 'it', fullName: 'Italian');
+const tLanguage12 = Language(id: 12, shortName: 'fr', fullName: 'Français');
+const tLanguage1 = Language(id: 1, shortName: 'de', fullName: 'Deutsch');
 const tLanguage23 = Language(
   id: 23,
   shortName: 'id',
   fullName: 'Bahasa Indonesia',
 );
-const tLanguage6 = Language(
-  id: 6,
-  shortName: 'nl',
-  fullName: 'Nederlands',
-);
-const tLanguage7 = Language(
-  id: 7,
-  shortName: 'pt',
-  fullName: 'Português',
-);
+const tLanguage6 = Language(id: 6, shortName: 'nl', fullName: 'Nederlands');
+const tLanguage7 = Language(id: 7, shortName: 'pt', fullName: 'Português');
 
 final squatsPT = Translation(
   id: 1598,
diff --git a/test_data/workouts.dart b/test_data/workouts.dart
index ecd36a31..2491c50d 100644
--- a/test_data/workouts.dart
+++ b/test_data/workouts.dart
@@ -110,12 +110,7 @@ WorkoutPlan getWorkout({List<Exercise>? exercises}) {
   settingSquat.exercise = testBases[4];
   settingSquat.weight = 120;
 
-  final setSquat = Set.withData(
-    id: 2,
-    day: 1,
-    sets: 3,
-    order: 1,
-  );
+  final setSquat = Set.withData(id: 2, day: 1, sets: 3, order: 1);
   setSquat.addExerciseBase(testBases[4]);
   setSquat.settings.add(settingSquat);
   setSquat.settingsComputed = [settingSquat, settingSquat];
@@ -135,12 +130,7 @@ WorkoutPlan getWorkout({List<Exercise>? exercises}) {
   settingSideRaises.exercise = testBases[5];
   settingSideRaises.weight = 6;
 
-  final setSideRaises = Set.withData(
-    id: 3,
-    day: 1,
-    sets: 3,
-    order: 1,
-  );
+  final setSideRaises = Set.withData(id: 3, day: 1, sets: 3, order: 1);
   setSideRaises.addExerciseBase(testBases[5]);
   setSideRaises.settings.add(settingSideRaises);
   setSideRaises.settingsComputed = [settingSideRaises, settingSideRaises];