diff --git a/lib/models/workouts/log.dart b/lib/models/workouts/log.dart
index 012294a5..43815803 100644
--- a/lib/models/workouts/log.dart
+++ b/lib/models/workouts/log.dart
@@ -16,8 +16,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import 'dart:ui';
-
 import 'package:json_annotation/json_annotation.dart';
 import 'package:wger/helpers/json.dart';
 import 'package:wger/helpers/misc.dart';
@@ -133,7 +131,8 @@ class Log {
 
   @override
   //ignore: avoid_equals_and_hash_code_on_mutable_classes
-  int get hashCode => Object.hash(exerciseBaseId, weight, weightUnitId, reps, repetitionUnitId, rir);
+  int get hashCode =>
+      Object.hash(exerciseBaseId, weight, weightUnitId, reps, repetitionUnitId, rir);
 
   //@override
   //int get hashCode => super.hashCode;
diff --git a/pubspec.lock b/pubspec.lock
index d06b702a..d17e31e3 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -328,6 +328,11 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.4.0"
+  flutter_driver:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   flutter_html:
     dependency: "direct main"
     description:
@@ -397,7 +402,7 @@ packages:
     source: hosted
     version: "2.0.5"
   flutter_svg:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: flutter_svg
       url: "https://pub.dartlang.org"
@@ -434,6 +439,11 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.2"
+  fuchsia_remote_debug_protocol:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   glob:
     dependency: transitive
     description:
@@ -518,6 +528,11 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.6.2"
+  integration_test:
+    dependency: "direct dev"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   intl:
     dependency: "direct main"
     description:
@@ -623,6 +638,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "5.3.2"
+  multi_select_flutter:
+    dependency: "direct main"
+    description:
+      name: multi_select_flutter
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "4.1.2"
   nested:
     dependency: transitive
     description:
@@ -908,6 +930,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.1"
+  sync_http:
+    dependency: transitive
+    description:
+      name: sync_http
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.3.1"
   table_calendar:
     dependency: "direct main"
     description:
@@ -949,7 +978,7 @@ packages:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.3.1"
   url_launcher:
     dependency: "direct main"
     description:
@@ -1069,6 +1098,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.8"
+  vm_service:
+    dependency: transitive
+    description:
+      name: vm_service
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "9.0.0"
   wakelock:
     dependency: transitive
     description:
@@ -1118,6 +1154,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.2.0"
+  webdriver:
+    dependency: transitive
+    description:
+      name: webdriver
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.0"
   webview_flutter:
     dependency: transitive
     description:
diff --git a/test/gallery/gallery_screen_test.mocks.dart b/test/gallery/gallery_screen_test.mocks.dart
index def9b0cb..5eb63aad 100644
--- a/test/gallery/gallery_screen_test.mocks.dart
+++ b/test/gallery/gallery_screen_test.mocks.dart
@@ -181,6 +181,16 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider {
         returnValueForMissingStub: _i6.Future<void>.value(),
       ) as _i6.Future<void>);
   @override
+  Map<String, String> getDefaultHeaders({dynamic includeAuth = false}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getDefaultHeaders,
+          [],
+          {#includeAuth: includeAuth},
+        ),
+        returnValue: <String, String>{},
+      ) as Map<String, String>);
+  @override
   Uri makeUrl(
     String? path, {
     int? id,
@@ -216,7 +226,8 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider {
           #fetch,
           [uri],
         ),
-        returnValue: _i6.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+        returnValue:
+            _i6.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
       ) as _i6.Future<Map<String, dynamic>>);
   @override
   _i6.Future<Map<String, dynamic>> post(
@@ -231,7 +242,8 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider {
             uri,
           ],
         ),
-        returnValue: _i6.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+        returnValue:
+            _i6.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
       ) as _i6.Future<Map<String, dynamic>>);
   @override
   _i6.Future<Map<String, dynamic>> patch(
@@ -246,7 +258,8 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider {
             uri,
           ],
         ),
-        returnValue: _i6.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+        returnValue:
+            _i6.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
       ) as _i6.Future<Map<String, dynamic>>);
   @override
   _i6.Future<_i3.Response> deleteRequest(
diff --git a/test/measurements/measurement_categories_screen_test.mocks.dart b/test/measurements/measurement_categories_screen_test.mocks.dart
index 9eda4a2f..eab13e15 100644
--- a/test/measurements/measurement_categories_screen_test.mocks.dart
+++ b/test/measurements/measurement_categories_screen_test.mocks.dart
@@ -23,7 +23,8 @@ import 'package:wger/providers/measurement.dart' as _i4;
 // ignore_for_file: camel_case_types
 // ignore_for_file: subtype_of_sealed_class
 
-class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider {
+class _FakeWgerBaseProvider_0 extends _i1.SmartFake
+    implements _i2.WgerBaseProvider {
   _FakeWgerBaseProvider_0(
     Object parent,
     Invocation parentInvocation,
@@ -33,7 +34,8 @@ class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvi
         );
 }
 
-class _FakeMeasurementCategory_1 extends _i1.SmartFake implements _i3.MeasurementCategory {
+class _FakeMeasurementCategory_1 extends _i1.SmartFake
+    implements _i3.MeasurementCategory {
   _FakeMeasurementCategory_1(
     Object parent,
     Invocation parentInvocation,
@@ -46,7 +48,8 @@ class _FakeMeasurementCategory_1 extends _i1.SmartFake implements _i3.Measuremen
 /// A class which mocks [MeasurementProvider].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockMeasurementProvider extends _i1.Mock implements _i4.MeasurementProvider {
+class MockMeasurementProvider extends _i1.Mock
+    implements _i4.MeasurementProvider {
   MockMeasurementProvider() {
     _i1.throwOnMissingStub(this);
   }
@@ -119,7 +122,8 @@ class MockMeasurementProvider extends _i1.Mock implements _i4.MeasurementProvide
         returnValueForMissingStub: _i5.Future<void>.value(),
       ) as _i5.Future<void>);
   @override
-  _i5.Future<void> addCategory(_i3.MeasurementCategory? category) => (super.noSuchMethod(
+  _i5.Future<void> addCategory(_i3.MeasurementCategory? category) =>
+      (super.noSuchMethod(
         Invocation.method(
           #addCategory,
           [category],
diff --git a/test/measurements/measurement_provider_test.mocks.dart b/test/measurements/measurement_provider_test.mocks.dart
index 618e77fe..50fd7f8b 100644
--- a/test/measurements/measurement_provider_test.mocks.dart
+++ b/test/measurements/measurement_provider_test.mocks.dart
@@ -102,6 +102,16 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
         returnValueForMissingStub: null,
       );
   @override
+  Map<String, String> getDefaultHeaders({dynamic includeAuth = false}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getDefaultHeaders,
+          [],
+          {#includeAuth: includeAuth},
+        ),
+        returnValue: <String, String>{},
+      ) as Map<String, String>);
+  @override
   Uri makeUrl(
     String? path, {
     int? id,
@@ -137,7 +147,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
           #fetch,
           [uri],
         ),
-        returnValue: _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+        returnValue:
+            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
       ) as _i5.Future<Map<String, dynamic>>);
   @override
   _i5.Future<Map<String, dynamic>> post(
@@ -152,7 +163,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
             uri,
           ],
         ),
-        returnValue: _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+        returnValue:
+            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
       ) as _i5.Future<Map<String, dynamic>>);
   @override
   _i5.Future<Map<String, dynamic>> patch(
@@ -167,7 +179,8 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
             uri,
           ],
         ),
-        returnValue: _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+        returnValue:
+            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
       ) as _i5.Future<Map<String, dynamic>>);
   @override
   _i5.Future<_i3.Response> deleteRequest(
diff --git a/test/nutrition/nutritional_plan_form_test.mocks.dart b/test/nutrition/nutritional_plan_form_test.mocks.dart
index 6c0626a6..a3a1a303 100644
--- a/test/nutrition/nutritional_plan_form_test.mocks.dart
+++ b/test/nutrition/nutritional_plan_form_test.mocks.dart
@@ -46,7 +46,8 @@ class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
         );
 }
 
-class _FakeNutritionalPlan_2 extends _i1.SmartFake implements _i4.NutritionalPlan {
+class _FakeNutritionalPlan_2 extends _i1.SmartFake
+    implements _i4.NutritionalPlan {
   _FakeNutritionalPlan_2(
     Object parent,
     Invocation parentInvocation,
@@ -109,7 +110,8 @@ class _FakeResponse_7 extends _i1.SmartFake implements _i3.Response {
 /// A class which mocks [NutritionPlansProvider].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansProvider {
+class MockNutritionPlansProvider extends _i1.Mock
+    implements _i8.NutritionPlansProvider {
   MockNutritionPlansProvider() {
     _i1.throwOnMissingStub(this);
   }
@@ -202,12 +204,14 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
         returnValueForMissingStub: _i9.Future<void>.value(),
       ) as _i9.Future<void>);
   @override
-  _i9.Future<_i4.NutritionalPlan> fetchAndSetPlanSparse(int? planId) => (super.noSuchMethod(
+  _i9.Future<_i4.NutritionalPlan> fetchAndSetPlanSparse(int? planId) =>
+      (super.noSuchMethod(
         Invocation.method(
           #fetchAndSetPlanSparse,
           [planId],
         ),
-        returnValue: _i9.Future<_i4.NutritionalPlan>.value(_FakeNutritionalPlan_2(
+        returnValue:
+            _i9.Future<_i4.NutritionalPlan>.value(_FakeNutritionalPlan_2(
           this,
           Invocation.method(
             #fetchAndSetPlanSparse,
@@ -216,12 +220,14 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
         )),
       ) as _i9.Future<_i4.NutritionalPlan>);
   @override
-  _i9.Future<_i4.NutritionalPlan> fetchAndSetPlanFull(int? planId) => (super.noSuchMethod(
+  _i9.Future<_i4.NutritionalPlan> fetchAndSetPlanFull(int? planId) =>
+      (super.noSuchMethod(
         Invocation.method(
           #fetchAndSetPlanFull,
           [planId],
         ),
-        returnValue: _i9.Future<_i4.NutritionalPlan>.value(_FakeNutritionalPlan_2(
+        returnValue:
+            _i9.Future<_i4.NutritionalPlan>.value(_FakeNutritionalPlan_2(
           this,
           Invocation.method(
             #fetchAndSetPlanFull,
@@ -230,12 +236,14 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
         )),
       ) as _i9.Future<_i4.NutritionalPlan>);
   @override
-  _i9.Future<_i4.NutritionalPlan> addPlan(_i4.NutritionalPlan? planData) => (super.noSuchMethod(
+  _i9.Future<_i4.NutritionalPlan> addPlan(_i4.NutritionalPlan? planData) =>
+      (super.noSuchMethod(
         Invocation.method(
           #addPlan,
           [planData],
         ),
-        returnValue: _i9.Future<_i4.NutritionalPlan>.value(_FakeNutritionalPlan_2(
+        returnValue:
+            _i9.Future<_i4.NutritionalPlan>.value(_FakeNutritionalPlan_2(
           this,
           Invocation.method(
             #addPlan,
@@ -333,7 +341,8 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
         )),
       ) as _i9.Future<_i6.MealItem>);
   @override
-  _i9.Future<void> deleteMealItem(_i6.MealItem? mealItem) => (super.noSuchMethod(
+  _i9.Future<void> deleteMealItem(_i6.MealItem? mealItem) =>
+      (super.noSuchMethod(
         Invocation.method(
           #deleteMealItem,
           [mealItem],
@@ -342,7 +351,8 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
         returnValueForMissingStub: _i9.Future<void>.value(),
       ) as _i9.Future<void>);
   @override
-  _i9.Future<_i7.Ingredient> fetchIngredient(int? ingredientId) => (super.noSuchMethod(
+  _i9.Future<_i7.Ingredient> fetchIngredient(int? ingredientId) =>
+      (super.noSuchMethod(
         Invocation.method(
           #fetchIngredient,
           [ingredientId],
@@ -380,7 +390,8 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
         returnValue: _i9.Future<List<dynamic>>.value(<dynamic>[]),
       ) as _i9.Future<List<dynamic>>);
   @override
-  _i9.Future<_i7.Ingredient?> searchIngredientWithCode(String? code) => (super.noSuchMethod(
+  _i9.Future<_i7.Ingredient?> searchIngredientWithCode(String? code) =>
+      (super.noSuchMethod(
         Invocation.method(
           #searchIngredientWithCode,
           [code],
@@ -431,7 +442,8 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
         returnValueForMissingStub: _i9.Future<void>.value(),
       ) as _i9.Future<void>);
   @override
-  _i9.Future<void> fetchAndSetLogs(_i4.NutritionalPlan? plan) => (super.noSuchMethod(
+  _i9.Future<void> fetchAndSetLogs(_i4.NutritionalPlan? plan) =>
+      (super.noSuchMethod(
         Invocation.method(
           #fetchAndSetLogs,
           [plan],
@@ -440,6 +452,16 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
         returnValueForMissingStub: _i9.Future<void>.value(),
       ) as _i9.Future<void>);
   @override
+  Map<String, String> getDefaultHeaders({dynamic includeAuth = false}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getDefaultHeaders,
+          [],
+          {#includeAuth: includeAuth},
+        ),
+        returnValue: <String, String>{},
+      ) as Map<String, String>);
+  @override
   Uri makeUrl(
     String? path, {
     int? id,
@@ -475,7 +497,8 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
           #fetch,
           [uri],
         ),
-        returnValue: _i9.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+        returnValue:
+            _i9.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
       ) as _i9.Future<Map<String, dynamic>>);
   @override
   _i9.Future<Map<String, dynamic>> post(
@@ -490,7 +513,8 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
             uri,
           ],
         ),
-        returnValue: _i9.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+        returnValue:
+            _i9.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
       ) as _i9.Future<Map<String, dynamic>>);
   @override
   _i9.Future<Map<String, dynamic>> patch(
@@ -505,7 +529,8 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
             uri,
           ],
         ),
-        returnValue: _i9.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+        returnValue:
+            _i9.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
       ) as _i9.Future<Map<String, dynamic>>);
   @override
   _i9.Future<_i3.Response> deleteRequest(
diff --git a/test/other/base_provider_test.mocks.dart b/test/other/base_provider_test.mocks.dart
index d5c998c8..5483f2a0 100644
--- a/test/other/base_provider_test.mocks.dart
+++ b/test/other/base_provider_test.mocks.dart
@@ -31,7 +31,8 @@ class _FakeResponse_0 extends _i1.SmartFake implements _i2.Response {
         );
 }
 
-class _FakeStreamedResponse_1 extends _i1.SmartFake implements _i2.StreamedResponse {
+class _FakeStreamedResponse_1 extends _i1.SmartFake
+    implements _i2.StreamedResponse {
   _FakeStreamedResponse_1(
     Object parent,
     Invocation parentInvocation,
@@ -236,12 +237,14 @@ class MockClient extends _i1.Mock implements _i2.Client {
         returnValue: _i3.Future<_i5.Uint8List>.value(_i5.Uint8List(0)),
       ) as _i3.Future<_i5.Uint8List>);
   @override
-  _i3.Future<_i2.StreamedResponse> send(_i2.BaseRequest? request) => (super.noSuchMethod(
+  _i3.Future<_i2.StreamedResponse> send(_i2.BaseRequest? request) =>
+      (super.noSuchMethod(
         Invocation.method(
           #send,
           [request],
         ),
-        returnValue: _i3.Future<_i2.StreamedResponse>.value(_FakeStreamedResponse_1(
+        returnValue:
+            _i3.Future<_i2.StreamedResponse>.value(_FakeStreamedResponse_1(
           this,
           Invocation.method(
             #send,
diff --git a/test/workout/gym_mode_screen_test.mocks.dart b/test/workout/gym_mode_screen_test.mocks.dart
index 696af330..362ca2e8 100644
--- a/test/workout/gym_mode_screen_test.mocks.dart
+++ b/test/workout/gym_mode_screen_test.mocks.dart
@@ -1,7 +1,8 @@
-// Mocks generated by Mockito 5.2.0 from annotations
+// Mocks generated by Mockito 5.3.2 from annotations
 // in wger/test/workout/gym_mode_screen_test.dart.
 // Do not manually edit this file.
 
+// ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i9;
 import 'dart:ui' as _i10;
 
@@ -23,20 +24,69 @@ import 'package:wger/providers/exercises.dart' as _i8;
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
 // ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
 
-class _FakeWgerBaseProvider_0 extends _i1.Fake implements _i2.WgerBaseProvider {
+class _FakeWgerBaseProvider_0 extends _i1.SmartFake
+    implements _i2.WgerBaseProvider {
+  _FakeWgerBaseProvider_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
 }
 
-class _FakeExerciseBase_1 extends _i1.Fake implements _i3.ExerciseBase {}
-
-class _FakeExerciseCategory_2 extends _i1.Fake implements _i4.ExerciseCategory {
+class _FakeExerciseBase_1 extends _i1.SmartFake implements _i3.ExerciseBase {
+  _FakeExerciseBase_1(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
 }
 
-class _FakeEquipment_3 extends _i1.Fake implements _i5.Equipment {}
+class _FakeExerciseCategory_2 extends _i1.SmartFake
+    implements _i4.ExerciseCategory {
+  _FakeExerciseCategory_2(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeMuscle_4 extends _i1.Fake implements _i6.Muscle {}
+class _FakeEquipment_3 extends _i1.SmartFake implements _i5.Equipment {
+  _FakeEquipment_3(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeLanguage_5 extends _i1.Fake implements _i7.Language {}
+class _FakeMuscle_4 extends _i1.SmartFake implements _i6.Muscle {
+  _FakeMuscle_4(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeLanguage_5 extends _i1.SmartFake implements _i7.Language {
+  _FakeLanguage_5(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
 /// A class which mocks [ExercisesProvider].
 ///
@@ -47,163 +97,328 @@ class MockExercisesProvider extends _i1.Mock implements _i8.ExercisesProvider {
   }
 
   @override
-  _i2.WgerBaseProvider get baseProvider =>
-      (super.noSuchMethod(Invocation.getter(#baseProvider),
-          returnValue: _FakeWgerBaseProvider_0()) as _i2.WgerBaseProvider);
+  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
+        Invocation.getter(#baseProvider),
+        returnValue: _FakeWgerBaseProvider_0(
+          this,
+          Invocation.getter(#baseProvider),
+        ),
+      ) as _i2.WgerBaseProvider);
   @override
   set exerciseBases(List<_i3.ExerciseBase>? exercisesBases) =>
-      super.noSuchMethod(Invocation.setter(#exerciseBases, exercisesBases),
-          returnValueForMissingStub: null);
+      super.noSuchMethod(
+        Invocation.setter(
+          #exerciseBases,
+          exercisesBases,
+        ),
+        returnValueForMissingStub: null,
+      );
   @override
-  List<_i3.ExerciseBase> get filteredExerciseBases =>
-      (super.noSuchMethod(Invocation.getter(#filteredExerciseBases),
-          returnValue: <_i3.ExerciseBase>[]) as List<_i3.ExerciseBase>);
+  List<_i3.ExerciseBase> get filteredExerciseBases => (super.noSuchMethod(
+        Invocation.getter(#filteredExerciseBases),
+        returnValue: <_i3.ExerciseBase>[],
+      ) as List<_i3.ExerciseBase>);
   @override
   set filteredExerciseBases(List<_i3.ExerciseBase>? newFilteredExercises) =>
       super.noSuchMethod(
-          Invocation.setter(#filteredExerciseBases, newFilteredExercises),
-          returnValueForMissingStub: null);
+        Invocation.setter(
+          #filteredExerciseBases,
+          newFilteredExercises,
+        ),
+        returnValueForMissingStub: null,
+      );
   @override
   Map<int, List<_i3.ExerciseBase>> get exerciseBasesByVariation =>
-      (super.noSuchMethod(Invocation.getter(#exerciseBasesByVariation),
-              returnValue: <int, List<_i3.ExerciseBase>>{})
-          as Map<int, List<_i3.ExerciseBase>>);
-  @override
-  List<_i3.ExerciseBase> get bases =>
-      (super.noSuchMethod(Invocation.getter(#bases),
-          returnValue: <_i3.ExerciseBase>[]) as List<_i3.ExerciseBase>);
-  @override
-  List<_i4.ExerciseCategory> get categories =>
-      (super.noSuchMethod(Invocation.getter(#categories),
-          returnValue: <_i4.ExerciseCategory>[]) as List<_i4.ExerciseCategory>);
-  @override
-  List<_i6.Muscle> get muscles =>
-      (super.noSuchMethod(Invocation.getter(#muscles),
-          returnValue: <_i6.Muscle>[]) as List<_i6.Muscle>);
-  @override
-  List<_i5.Equipment> get equipment =>
-      (super.noSuchMethod(Invocation.getter(#equipment),
-          returnValue: <_i5.Equipment>[]) as List<_i5.Equipment>);
-  @override
-  List<_i7.Language> get languages =>
-      (super.noSuchMethod(Invocation.getter(#languages),
-          returnValue: <_i7.Language>[]) as List<_i7.Language>);
-  @override
-  set languages(List<_i7.Language>? languages) =>
-      super.noSuchMethod(Invocation.setter(#languages, languages),
-          returnValueForMissingStub: null);
-  @override
-  bool get hasListeners =>
-      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false)
-          as bool);
-  @override
-  _i9.Future<void> setFilters(_i8.Filters? newFilters) =>
-      (super.noSuchMethod(Invocation.method(#setFilters, [newFilters]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
-  @override
-  _i9.Future<void> findByFilters() =>
-      (super.noSuchMethod(Invocation.method(#findByFilters, []),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
-  @override
-  void clear() => super.noSuchMethod(Invocation.method(#clear, []),
-      returnValueForMissingStub: null);
-  @override
-  _i3.ExerciseBase findExerciseBaseById(int? id) =>
-      (super.noSuchMethod(Invocation.method(#findExerciseBaseById, [id]),
-          returnValue: _FakeExerciseBase_1()) as _i3.ExerciseBase);
-  @override
-  List<_i3.ExerciseBase> findExerciseBasesByVariationId(int? id,
-          {int? exerciseBaseIdToExclude}) =>
       (super.noSuchMethod(
-          Invocation.method(#findExerciseBasesByVariationId, [id],
-              {#exerciseBaseIdToExclude: exerciseBaseIdToExclude}),
-          returnValue: <_i3.ExerciseBase>[]) as List<_i3.ExerciseBase>);
+        Invocation.getter(#exerciseBasesByVariation),
+        returnValue: <int, List<_i3.ExerciseBase>>{},
+      ) as Map<int, List<_i3.ExerciseBase>>);
   @override
-  _i4.ExerciseCategory findCategoryById(int? id) =>
-      (super.noSuchMethod(Invocation.method(#findCategoryById, [id]),
-          returnValue: _FakeExerciseCategory_2()) as _i4.ExerciseCategory);
+  List<_i3.ExerciseBase> get bases => (super.noSuchMethod(
+        Invocation.getter(#bases),
+        returnValue: <_i3.ExerciseBase>[],
+      ) as List<_i3.ExerciseBase>);
   @override
-  _i5.Equipment findEquipmentById(int? id) =>
-      (super.noSuchMethod(Invocation.method(#findEquipmentById, [id]),
-          returnValue: _FakeEquipment_3()) as _i5.Equipment);
+  List<_i4.ExerciseCategory> get categories => (super.noSuchMethod(
+        Invocation.getter(#categories),
+        returnValue: <_i4.ExerciseCategory>[],
+      ) as List<_i4.ExerciseCategory>);
   @override
-  _i6.Muscle findMuscleById(int? id) =>
-      (super.noSuchMethod(Invocation.method(#findMuscleById, [id]),
-          returnValue: _FakeMuscle_4()) as _i6.Muscle);
+  List<_i6.Muscle> get muscles => (super.noSuchMethod(
+        Invocation.getter(#muscles),
+        returnValue: <_i6.Muscle>[],
+      ) as List<_i6.Muscle>);
   @override
-  _i7.Language findLanguageById(int? id) =>
-      (super.noSuchMethod(Invocation.method(#findLanguageById, [id]),
-          returnValue: _FakeLanguage_5()) as _i7.Language);
+  List<_i5.Equipment> get equipment => (super.noSuchMethod(
+        Invocation.getter(#equipment),
+        returnValue: <_i5.Equipment>[],
+      ) as List<_i5.Equipment>);
   @override
-  _i9.Future<void> fetchAndSetCategories() =>
-      (super.noSuchMethod(Invocation.method(#fetchAndSetCategories, []),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
+  List<_i7.Language> get languages => (super.noSuchMethod(
+        Invocation.getter(#languages),
+        returnValue: <_i7.Language>[],
+      ) as List<_i7.Language>);
   @override
-  _i9.Future<void> fetchAndSetVariations() =>
-      (super.noSuchMethod(Invocation.method(#fetchAndSetVariations, []),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
+  set languages(List<_i7.Language>? languages) => super.noSuchMethod(
+        Invocation.setter(
+          #languages,
+          languages,
+        ),
+        returnValueForMissingStub: null,
+      );
   @override
-  _i9.Future<void> fetchAndSetMuscles() =>
-      (super.noSuchMethod(Invocation.method(#fetchAndSetMuscles, []),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
+  bool get hasListeners => (super.noSuchMethod(
+        Invocation.getter(#hasListeners),
+        returnValue: false,
+      ) as bool);
   @override
-  _i9.Future<void> fetchAndSetEquipment() =>
-      (super.noSuchMethod(Invocation.method(#fetchAndSetEquipment, []),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
+  _i9.Future<void> setFilters(_i8.Filters? newFilters) => (super.noSuchMethod(
+        Invocation.method(
+          #setFilters,
+          [newFilters],
+        ),
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.Future<void>.value(),
+      ) as _i9.Future<void>);
   @override
-  _i9.Future<void> fetchAndSetLanguages() =>
-      (super.noSuchMethod(Invocation.method(#fetchAndSetLanguages, []),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
+  _i9.Future<void> findByFilters() => (super.noSuchMethod(
+        Invocation.method(
+          #findByFilters,
+          [],
+        ),
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.Future<void>.value(),
+      ) as _i9.Future<void>);
+  @override
+  void clear() => super.noSuchMethod(
+        Invocation.method(
+          #clear,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i3.ExerciseBase findExerciseBaseById(int? id) => (super.noSuchMethod(
+        Invocation.method(
+          #findExerciseBaseById,
+          [id],
+        ),
+        returnValue: _FakeExerciseBase_1(
+          this,
+          Invocation.method(
+            #findExerciseBaseById,
+            [id],
+          ),
+        ),
+      ) as _i3.ExerciseBase);
+  @override
+  List<_i3.ExerciseBase> findExerciseBasesByVariationId(
+    int? id, {
+    int? exerciseBaseIdToExclude,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #findExerciseBasesByVariationId,
+          [id],
+          {#exerciseBaseIdToExclude: exerciseBaseIdToExclude},
+        ),
+        returnValue: <_i3.ExerciseBase>[],
+      ) as List<_i3.ExerciseBase>);
+  @override
+  _i4.ExerciseCategory findCategoryById(int? id) => (super.noSuchMethod(
+        Invocation.method(
+          #findCategoryById,
+          [id],
+        ),
+        returnValue: _FakeExerciseCategory_2(
+          this,
+          Invocation.method(
+            #findCategoryById,
+            [id],
+          ),
+        ),
+      ) as _i4.ExerciseCategory);
+  @override
+  _i5.Equipment findEquipmentById(int? id) => (super.noSuchMethod(
+        Invocation.method(
+          #findEquipmentById,
+          [id],
+        ),
+        returnValue: _FakeEquipment_3(
+          this,
+          Invocation.method(
+            #findEquipmentById,
+            [id],
+          ),
+        ),
+      ) as _i5.Equipment);
+  @override
+  _i6.Muscle findMuscleById(int? id) => (super.noSuchMethod(
+        Invocation.method(
+          #findMuscleById,
+          [id],
+        ),
+        returnValue: _FakeMuscle_4(
+          this,
+          Invocation.method(
+            #findMuscleById,
+            [id],
+          ),
+        ),
+      ) as _i6.Muscle);
+  @override
+  _i7.Language findLanguageById(int? id) => (super.noSuchMethod(
+        Invocation.method(
+          #findLanguageById,
+          [id],
+        ),
+        returnValue: _FakeLanguage_5(
+          this,
+          Invocation.method(
+            #findLanguageById,
+            [id],
+          ),
+        ),
+      ) as _i7.Language);
+  @override
+  _i9.Future<void> fetchAndSetCategories() => (super.noSuchMethod(
+        Invocation.method(
+          #fetchAndSetCategories,
+          [],
+        ),
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.Future<void>.value(),
+      ) as _i9.Future<void>);
+  @override
+  _i9.Future<void> fetchAndSetVariations() => (super.noSuchMethod(
+        Invocation.method(
+          #fetchAndSetVariations,
+          [],
+        ),
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.Future<void>.value(),
+      ) as _i9.Future<void>);
+  @override
+  _i9.Future<void> fetchAndSetMuscles() => (super.noSuchMethod(
+        Invocation.method(
+          #fetchAndSetMuscles,
+          [],
+        ),
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.Future<void>.value(),
+      ) as _i9.Future<void>);
+  @override
+  _i9.Future<void> fetchAndSetEquipment() => (super.noSuchMethod(
+        Invocation.method(
+          #fetchAndSetEquipment,
+          [],
+        ),
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.Future<void>.value(),
+      ) as _i9.Future<void>);
+  @override
+  _i9.Future<void> fetchAndSetLanguages() => (super.noSuchMethod(
+        Invocation.method(
+          #fetchAndSetLanguages,
+          [],
+        ),
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.Future<void>.value(),
+      ) as _i9.Future<void>);
   @override
   _i9.Future<_i3.ExerciseBase> fetchAndSetExerciseBase(int? exerciseBaseId) =>
       (super.noSuchMethod(
-              Invocation.method(#fetchAndSetExerciseBase, [exerciseBaseId]),
-              returnValue:
-                  Future<_i3.ExerciseBase>.value(_FakeExerciseBase_1()))
-          as _i9.Future<_i3.ExerciseBase>);
+        Invocation.method(
+          #fetchAndSetExerciseBase,
+          [exerciseBaseId],
+        ),
+        returnValue: _i9.Future<_i3.ExerciseBase>.value(_FakeExerciseBase_1(
+          this,
+          Invocation.method(
+            #fetchAndSetExerciseBase,
+            [exerciseBaseId],
+          ),
+        )),
+      ) as _i9.Future<_i3.ExerciseBase>);
   @override
   _i3.ExerciseBase readExerciseBaseFromBaseInfo(dynamic baseData) =>
       (super.noSuchMethod(
-          Invocation.method(#readExerciseBaseFromBaseInfo, [baseData]),
-          returnValue: _FakeExerciseBase_1()) as _i3.ExerciseBase);
+        Invocation.method(
+          #readExerciseBaseFromBaseInfo,
+          [baseData],
+        ),
+        returnValue: _FakeExerciseBase_1(
+          this,
+          Invocation.method(
+            #readExerciseBaseFromBaseInfo,
+            [baseData],
+          ),
+        ),
+      ) as _i3.ExerciseBase);
   @override
-  _i9.Future<void> checkExerciseCacheVersion() =>
-      (super.noSuchMethod(Invocation.method(#checkExerciseCacheVersion, []),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
+  _i9.Future<void> checkExerciseCacheVersion() => (super.noSuchMethod(
+        Invocation.method(
+          #checkExerciseCacheVersion,
+          [],
+        ),
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.Future<void>.value(),
+      ) as _i9.Future<void>);
   @override
-  _i9.Future<void> fetchAndSetExercises() =>
-      (super.noSuchMethod(Invocation.method(#fetchAndSetExercises, []),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i9.Future<void>);
+  _i9.Future<void> fetchAndSetExercises() => (super.noSuchMethod(
+        Invocation.method(
+          #fetchAndSetExercises,
+          [],
+        ),
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.Future<void>.value(),
+      ) as _i9.Future<void>);
   @override
-  _i9.Future<List<_i3.ExerciseBase>> searchExercise(String? name,
-          [String? languageCode = r'en']) =>
+  _i9.Future<List<_i3.ExerciseBase>> searchExercise(
+    String? name, [
+    String? languageCode = r'en',
+  ]) =>
       (super.noSuchMethod(
-              Invocation.method(#searchExercise, [name, languageCode]),
-              returnValue:
-                  Future<List<_i3.ExerciseBase>>.value(<_i3.ExerciseBase>[]))
-          as _i9.Future<List<_i3.ExerciseBase>>);
+        Invocation.method(
+          #searchExercise,
+          [
+            name,
+            languageCode,
+          ],
+        ),
+        returnValue:
+            _i9.Future<List<_i3.ExerciseBase>>.value(<_i3.ExerciseBase>[]),
+      ) as _i9.Future<List<_i3.ExerciseBase>>);
   @override
-  void addListener(_i10.VoidCallback? listener) =>
-      super.noSuchMethod(Invocation.method(#addListener, [listener]),
-          returnValueForMissingStub: null);
+  void addListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+        Invocation.method(
+          #addListener,
+          [listener],
+        ),
+        returnValueForMissingStub: null,
+      );
   @override
-  void removeListener(_i10.VoidCallback? listener) =>
-      super.noSuchMethod(Invocation.method(#removeListener, [listener]),
-          returnValueForMissingStub: null);
+  void removeListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+        Invocation.method(
+          #removeListener,
+          [listener],
+        ),
+        returnValueForMissingStub: null,
+      );
   @override
-  void dispose() => super.noSuchMethod(Invocation.method(#dispose, []),
-      returnValueForMissingStub: null);
+  void dispose() => super.noSuchMethod(
+        Invocation.method(
+          #dispose,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
   @override
-  void notifyListeners() =>
-      super.noSuchMethod(Invocation.method(#notifyListeners, []),
-          returnValueForMissingStub: null);
+  void notifyListeners() => super.noSuchMethod(
+        Invocation.method(
+          #notifyListeners,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
 }
diff --git a/test/workout/workout_form_test.mocks.dart b/test/workout/workout_form_test.mocks.dart
index 270bb4db..adb552a6 100644
--- a/test/workout/workout_form_test.mocks.dart
+++ b/test/workout/workout_form_test.mocks.dart
@@ -41,7 +41,8 @@ class _FakeWeightUnit_0 extends _i1.SmartFake implements _i2.WeightUnit {
         );
 }
 
-class _FakeRepetitionUnit_1 extends _i1.SmartFake implements _i3.RepetitionUnit {
+class _FakeRepetitionUnit_1 extends _i1.SmartFake
+    implements _i3.RepetitionUnit {
   _FakeRepetitionUnit_1(
     Object parent,
     Invocation parentInvocation,
@@ -111,7 +112,8 @@ class _FakeSetting_7 extends _i1.SmartFake implements _i9.Setting {
         );
 }
 
-class _FakeWorkoutSession_8 extends _i1.SmartFake implements _i10.WorkoutSession {
+class _FakeWorkoutSession_8 extends _i1.SmartFake
+    implements _i10.WorkoutSession {
   _FakeWorkoutSession_8(
     Object parent,
     Invocation parentInvocation,
@@ -154,7 +156,8 @@ class _FakeResponse_11 extends _i1.SmartFake implements _i5.Response {
 /// A class which mocks [WorkoutPlansProvider].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockWorkoutPlansProvider extends _i1.Mock implements _i12.WorkoutPlansProvider {
+class MockWorkoutPlansProvider extends _i1.Mock
+    implements _i12.WorkoutPlansProvider {
   MockWorkoutPlansProvider() {
     _i1.throwOnMissingStub(this);
   }
@@ -292,7 +295,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i12.WorkoutPlansProv
         returnValueForMissingStub: _i13.Future<void>.value(),
       ) as _i13.Future<void>);
   @override
-  _i13.Future<_i6.WorkoutPlan> fetchAndSetPlanSparse(int? planId) => (super.noSuchMethod(
+  _i13.Future<_i6.WorkoutPlan> fetchAndSetPlanSparse(int? planId) =>
+      (super.noSuchMethod(
         Invocation.method(
           #fetchAndSetPlanSparse,
           [planId],
@@ -306,7 +310,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i12.WorkoutPlansProv
         )),
       ) as _i13.Future<_i6.WorkoutPlan>);
   @override
-  _i13.Future<_i6.WorkoutPlan> fetchAndSetWorkoutPlanFull(int? workoutId) => (super.noSuchMethod(
+  _i13.Future<_i6.WorkoutPlan> fetchAndSetWorkoutPlanFull(int? workoutId) =>
+      (super.noSuchMethod(
         Invocation.method(
           #fetchAndSetWorkoutPlanFull,
           [workoutId],
@@ -320,7 +325,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i12.WorkoutPlansProv
         )),
       ) as _i13.Future<_i6.WorkoutPlan>);
   @override
-  _i13.Future<_i6.WorkoutPlan> addWorkout(_i6.WorkoutPlan? workout) => (super.noSuchMethod(
+  _i13.Future<_i6.WorkoutPlan> addWorkout(_i6.WorkoutPlan? workout) =>
+      (super.noSuchMethod(
         Invocation.method(
           #addWorkout,
           [workout],
@@ -334,7 +340,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i12.WorkoutPlansProv
         )),
       ) as _i13.Future<_i6.WorkoutPlan>);
   @override
-  _i13.Future<void> editWorkout(_i6.WorkoutPlan? workout) => (super.noSuchMethod(
+  _i13.Future<void> editWorkout(_i6.WorkoutPlan? workout) =>
+      (super.noSuchMethod(
         Invocation.method(
           #editWorkout,
           [workout],
@@ -364,7 +371,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i12.WorkoutPlansProv
             exercise,
           ],
         ),
-        returnValue: _i13.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+        returnValue:
+            _i13.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
       ) as _i13.Future<Map<String, dynamic>>);
   @override
   _i13.Future<void> fetchAndSetRepetitionUnits() => (super.noSuchMethod(
@@ -474,7 +482,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i12.WorkoutPlansProv
         returnValue: _i13.Future<List<_i8.Set>>.value(<_i8.Set>[]),
       ) as _i13.Future<List<_i8.Set>>);
   @override
-  _i13.Future<void> fetchComputedSettings(_i8.Set? workoutSet) => (super.noSuchMethod(
+  _i13.Future<void> fetchComputedSettings(_i8.Set? workoutSet) =>
+      (super.noSuchMethod(
         Invocation.method(
           #fetchComputedSettings,
           [workoutSet],
@@ -507,7 +516,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i12.WorkoutPlansProv
         returnValueForMissingStub: _i13.Future<void>.value(),
       ) as _i13.Future<void>);
   @override
-  _i13.Future<_i9.Setting> addSetting(_i9.Setting? workoutSetting) => (super.noSuchMethod(
+  _i13.Future<_i9.Setting> addSetting(_i9.Setting? workoutSetting) =>
+      (super.noSuchMethod(
         Invocation.method(
           #addSetting,
           [workoutSetting],
@@ -529,12 +539,14 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i12.WorkoutPlansProv
         returnValue: _i13.Future<dynamic>.value(),
       ) as _i13.Future<dynamic>);
   @override
-  _i13.Future<_i10.WorkoutSession> addSession(_i10.WorkoutSession? session) => (super.noSuchMethod(
+  _i13.Future<_i10.WorkoutSession> addSession(_i10.WorkoutSession? session) =>
+      (super.noSuchMethod(
         Invocation.method(
           #addSession,
           [session],
         ),
-        returnValue: _i13.Future<_i10.WorkoutSession>.value(_FakeWorkoutSession_8(
+        returnValue:
+            _i13.Future<_i10.WorkoutSession>.value(_FakeWorkoutSession_8(
           this,
           Invocation.method(
             #addSession,
@@ -566,6 +578,16 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i12.WorkoutPlansProv
         returnValueForMissingStub: _i13.Future<void>.value(),
       ) as _i13.Future<void>);
   @override
+  Map<String, String> getDefaultHeaders({dynamic includeAuth = false}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getDefaultHeaders,
+          [],
+          {#includeAuth: includeAuth},
+        ),
+        returnValue: <String, String>{},
+      ) as Map<String, String>);
+  @override
   Uri makeUrl(
     String? path, {
     int? id,
@@ -601,7 +623,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i12.WorkoutPlansProv
           #fetch,
           [uri],
         ),
-        returnValue: _i13.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+        returnValue:
+            _i13.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
       ) as _i13.Future<Map<String, dynamic>>);
   @override
   _i13.Future<Map<String, dynamic>> post(
@@ -616,7 +639,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i12.WorkoutPlansProv
             uri,
           ],
         ),
-        returnValue: _i13.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+        returnValue:
+            _i13.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
       ) as _i13.Future<Map<String, dynamic>>);
   @override
   _i13.Future<Map<String, dynamic>> patch(
@@ -631,7 +655,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i12.WorkoutPlansProv
             uri,
           ],
         ),
-        returnValue: _i13.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+        returnValue:
+            _i13.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
       ) as _i13.Future<Map<String, dynamic>>);
   @override
   _i13.Future<_i5.Response> deleteRequest(
diff --git a/test/workout/workout_set_form_test.mocks.dart b/test/workout/workout_set_form_test.mocks.dart
index 3a05a7d5..c66ac24b 100644
--- a/test/workout/workout_set_form_test.mocks.dart
+++ b/test/workout/workout_set_form_test.mocks.dart
@@ -3,14 +3,17 @@
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i6;
-import 'dart:ui' as _i7;
+import 'dart:async' as _i9;
+import 'dart:ui' as _i10;
 
-import 'package:http/http.dart' as _i3;
 import 'package:mockito/mockito.dart' as _i1;
-import 'package:wger/models/exercises/exercise.dart' as _i4;
-import 'package:wger/providers/auth.dart' as _i2;
-import 'package:wger/providers/exercises.dart' as _i5;
+import 'package:wger/models/exercises/base.dart' as _i3;
+import 'package:wger/models/exercises/category.dart' as _i4;
+import 'package:wger/models/exercises/equipment.dart' as _i5;
+import 'package:wger/models/exercises/language.dart' as _i7;
+import 'package:wger/models/exercises/muscle.dart' as _i6;
+import 'package:wger/providers/base_provider.dart' as _i2;
+import 'package:wger/providers/exercises.dart' as _i8;
 
 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -23,8 +26,9 @@ import 'package:wger/providers/exercises.dart' as _i5;
 // ignore_for_file: camel_case_types
 // ignore_for_file: subtype_of_sealed_class
 
-class _FakeAuthProvider_0 extends _i1.SmartFake implements _i2.AuthProvider {
-  _FakeAuthProvider_0(
+class _FakeWgerBaseProvider_0 extends _i1.SmartFake
+    implements _i2.WgerBaseProvider {
+  _FakeWgerBaseProvider_0(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -33,8 +37,8 @@ class _FakeAuthProvider_0 extends _i1.SmartFake implements _i2.AuthProvider {
         );
 }
 
-class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
-  _FakeClient_1(
+class _FakeExerciseBase_1 extends _i1.SmartFake implements _i3.ExerciseBase {
+  _FakeExerciseBase_1(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -43,8 +47,9 @@ class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
         );
 }
 
-class _FakeExercise_2 extends _i1.SmartFake implements _i4.Exercise {
-  _FakeExercise_2(
+class _FakeExerciseCategory_2 extends _i1.SmartFake
+    implements _i4.ExerciseCategory {
+  _FakeExerciseCategory_2(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -53,8 +58,8 @@ class _FakeExercise_2 extends _i1.SmartFake implements _i4.Exercise {
         );
 }
 
-class _FakeUri_3 extends _i1.SmartFake implements Uri {
-  _FakeUri_3(
+class _FakeEquipment_3 extends _i1.SmartFake implements _i5.Equipment {
+  _FakeEquipment_3(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -63,8 +68,18 @@ class _FakeUri_3 extends _i1.SmartFake implements Uri {
         );
 }
 
-class _FakeResponse_4 extends _i1.SmartFake implements _i3.Response {
-  _FakeResponse_4(
+class _FakeMuscle_4 extends _i1.SmartFake implements _i6.Muscle {
+  _FakeMuscle_4(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeLanguage_5 extends _i1.SmartFake implements _i7.Language {
+  _FakeLanguage_5(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -76,45 +91,78 @@ class _FakeResponse_4 extends _i1.SmartFake implements _i3.Response {
 /// A class which mocks [ExercisesProvider].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockExercisesProvider extends _i1.Mock implements _i5.ExercisesProvider {
+class MockExercisesProvider extends _i1.Mock implements _i8.ExercisesProvider {
   MockExercisesProvider() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  List<_i4.Exercise> get items => (super.noSuchMethod(
-        Invocation.getter(#items),
-        returnValue: <_i4.Exercise>[],
-      ) as List<_i4.Exercise>);
-  @override
-  _i2.AuthProvider get auth => (super.noSuchMethod(
-        Invocation.getter(#auth),
-        returnValue: _FakeAuthProvider_0(
+  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
+        Invocation.getter(#baseProvider),
+        returnValue: _FakeWgerBaseProvider_0(
           this,
-          Invocation.getter(#auth),
+          Invocation.getter(#baseProvider),
         ),
-      ) as _i2.AuthProvider);
+      ) as _i2.WgerBaseProvider);
   @override
-  set auth(_i2.AuthProvider? _auth) => super.noSuchMethod(
+  set exerciseBases(List<_i3.ExerciseBase>? exercisesBases) =>
+      super.noSuchMethod(
         Invocation.setter(
-          #auth,
-          _auth,
+          #exerciseBases,
+          exercisesBases,
         ),
         returnValueForMissingStub: null,
       );
   @override
-  _i3.Client get client => (super.noSuchMethod(
-        Invocation.getter(#client),
-        returnValue: _FakeClient_1(
-          this,
-          Invocation.getter(#client),
-        ),
-      ) as _i3.Client);
+  List<_i3.ExerciseBase> get filteredExerciseBases => (super.noSuchMethod(
+        Invocation.getter(#filteredExerciseBases),
+        returnValue: <_i3.ExerciseBase>[],
+      ) as List<_i3.ExerciseBase>);
   @override
-  set client(_i3.Client? _client) => super.noSuchMethod(
+  set filteredExerciseBases(List<_i3.ExerciseBase>? newFilteredExercises) =>
+      super.noSuchMethod(
         Invocation.setter(
-          #client,
-          _client,
+          #filteredExerciseBases,
+          newFilteredExercises,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  Map<int, List<_i3.ExerciseBase>> get exerciseBasesByVariation =>
+      (super.noSuchMethod(
+        Invocation.getter(#exerciseBasesByVariation),
+        returnValue: <int, List<_i3.ExerciseBase>>{},
+      ) as Map<int, List<_i3.ExerciseBase>>);
+  @override
+  List<_i3.ExerciseBase> get bases => (super.noSuchMethod(
+        Invocation.getter(#bases),
+        returnValue: <_i3.ExerciseBase>[],
+      ) as List<_i3.ExerciseBase>);
+  @override
+  List<_i4.ExerciseCategory> get categories => (super.noSuchMethod(
+        Invocation.getter(#categories),
+        returnValue: <_i4.ExerciseCategory>[],
+      ) as List<_i4.ExerciseCategory>);
+  @override
+  List<_i6.Muscle> get muscles => (super.noSuchMethod(
+        Invocation.getter(#muscles),
+        returnValue: <_i6.Muscle>[],
+      ) as List<_i6.Muscle>);
+  @override
+  List<_i5.Equipment> get equipment => (super.noSuchMethod(
+        Invocation.getter(#equipment),
+        returnValue: <_i5.Equipment>[],
+      ) as List<_i5.Equipment>);
+  @override
+  List<_i7.Language> get languages => (super.noSuchMethod(
+        Invocation.getter(#languages),
+        returnValue: <_i7.Language>[],
+      ) as List<_i7.Language>);
+  @override
+  set languages(List<_i7.Language>? languages) => super.noSuchMethod(
+        Invocation.setter(
+          #languages,
+          languages,
         ),
         returnValueForMissingStub: null,
       );
@@ -124,80 +172,209 @@ class MockExercisesProvider extends _i1.Mock implements _i5.ExercisesProvider {
         returnValue: false,
       ) as bool);
   @override
-  _i4.Exercise findById(int? exerciseId) => (super.noSuchMethod(
+  _i9.Future<void> setFilters(_i8.Filters? newFilters) => (super.noSuchMethod(
         Invocation.method(
-          #findById,
-          [exerciseId],
+          #setFilters,
+          [newFilters],
         ),
-        returnValue: _FakeExercise_2(
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.Future<void>.value(),
+      ) as _i9.Future<void>);
+  @override
+  _i9.Future<void> findByFilters() => (super.noSuchMethod(
+        Invocation.method(
+          #findByFilters,
+          [],
+        ),
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.Future<void>.value(),
+      ) as _i9.Future<void>);
+  @override
+  void clear() => super.noSuchMethod(
+        Invocation.method(
+          #clear,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i3.ExerciseBase findExerciseBaseById(int? id) => (super.noSuchMethod(
+        Invocation.method(
+          #findExerciseBaseById,
+          [id],
+        ),
+        returnValue: _FakeExerciseBase_1(
           this,
           Invocation.method(
-            #findById,
-            [exerciseId],
+            #findExerciseBaseById,
+            [id],
           ),
         ),
-      ) as _i4.Exercise);
+      ) as _i3.ExerciseBase);
   @override
-  _i6.Future<void> fetchAndSetCategories() => (super.noSuchMethod(
+  List<_i3.ExerciseBase> findExerciseBasesByVariationId(
+    int? id, {
+    int? exerciseBaseIdToExclude,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #findExerciseBasesByVariationId,
+          [id],
+          {#exerciseBaseIdToExclude: exerciseBaseIdToExclude},
+        ),
+        returnValue: <_i3.ExerciseBase>[],
+      ) as List<_i3.ExerciseBase>);
+  @override
+  _i4.ExerciseCategory findCategoryById(int? id) => (super.noSuchMethod(
+        Invocation.method(
+          #findCategoryById,
+          [id],
+        ),
+        returnValue: _FakeExerciseCategory_2(
+          this,
+          Invocation.method(
+            #findCategoryById,
+            [id],
+          ),
+        ),
+      ) as _i4.ExerciseCategory);
+  @override
+  _i5.Equipment findEquipmentById(int? id) => (super.noSuchMethod(
+        Invocation.method(
+          #findEquipmentById,
+          [id],
+        ),
+        returnValue: _FakeEquipment_3(
+          this,
+          Invocation.method(
+            #findEquipmentById,
+            [id],
+          ),
+        ),
+      ) as _i5.Equipment);
+  @override
+  _i6.Muscle findMuscleById(int? id) => (super.noSuchMethod(
+        Invocation.method(
+          #findMuscleById,
+          [id],
+        ),
+        returnValue: _FakeMuscle_4(
+          this,
+          Invocation.method(
+            #findMuscleById,
+            [id],
+          ),
+        ),
+      ) as _i6.Muscle);
+  @override
+  _i7.Language findLanguageById(int? id) => (super.noSuchMethod(
+        Invocation.method(
+          #findLanguageById,
+          [id],
+        ),
+        returnValue: _FakeLanguage_5(
+          this,
+          Invocation.method(
+            #findLanguageById,
+            [id],
+          ),
+        ),
+      ) as _i7.Language);
+  @override
+  _i9.Future<void> fetchAndSetCategories() => (super.noSuchMethod(
         Invocation.method(
           #fetchAndSetCategories,
           [],
         ),
-        returnValue: _i6.Future<void>.value(),
-        returnValueForMissingStub: _i6.Future<void>.value(),
-      ) as _i6.Future<void>);
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.Future<void>.value(),
+      ) as _i9.Future<void>);
   @override
-  _i6.Future<void> fetchAndSetMuscles() => (super.noSuchMethod(
+  _i9.Future<void> fetchAndSetVariations() => (super.noSuchMethod(
+        Invocation.method(
+          #fetchAndSetVariations,
+          [],
+        ),
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.Future<void>.value(),
+      ) as _i9.Future<void>);
+  @override
+  _i9.Future<void> fetchAndSetMuscles() => (super.noSuchMethod(
         Invocation.method(
           #fetchAndSetMuscles,
           [],
         ),
-        returnValue: _i6.Future<void>.value(),
-        returnValueForMissingStub: _i6.Future<void>.value(),
-      ) as _i6.Future<void>);
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.Future<void>.value(),
+      ) as _i9.Future<void>);
   @override
-  _i6.Future<void> fetchAndSetEquipment() => (super.noSuchMethod(
+  _i9.Future<void> fetchAndSetEquipment() => (super.noSuchMethod(
         Invocation.method(
           #fetchAndSetEquipment,
           [],
         ),
-        returnValue: _i6.Future<void>.value(),
-        returnValueForMissingStub: _i6.Future<void>.value(),
-      ) as _i6.Future<void>);
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.Future<void>.value(),
+      ) as _i9.Future<void>);
   @override
-  _i6.Future<_i4.Exercise> fetchAndSetExercise(int? exerciseId) => (super.noSuchMethod(
+  _i9.Future<void> fetchAndSetLanguages() => (super.noSuchMethod(
         Invocation.method(
-          #fetchAndSetExercise,
-          [exerciseId],
+          #fetchAndSetLanguages,
+          [],
         ),
-        returnValue: _i6.Future<_i4.Exercise>.value(_FakeExercise_2(
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.Future<void>.value(),
+      ) as _i9.Future<void>);
+  @override
+  _i9.Future<_i3.ExerciseBase> fetchAndSetExerciseBase(int? exerciseBaseId) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchAndSetExerciseBase,
+          [exerciseBaseId],
+        ),
+        returnValue: _i9.Future<_i3.ExerciseBase>.value(_FakeExerciseBase_1(
           this,
           Invocation.method(
-            #fetchAndSetExercise,
-            [exerciseId],
+            #fetchAndSetExerciseBase,
+            [exerciseBaseId],
           ),
         )),
-      ) as _i6.Future<_i4.Exercise>);
+      ) as _i9.Future<_i3.ExerciseBase>);
   @override
-  _i6.Future<void> checkExerciseCacheVersion() => (super.noSuchMethod(
+  _i3.ExerciseBase readExerciseBaseFromBaseInfo(dynamic baseData) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #readExerciseBaseFromBaseInfo,
+          [baseData],
+        ),
+        returnValue: _FakeExerciseBase_1(
+          this,
+          Invocation.method(
+            #readExerciseBaseFromBaseInfo,
+            [baseData],
+          ),
+        ),
+      ) as _i3.ExerciseBase);
+  @override
+  _i9.Future<void> checkExerciseCacheVersion() => (super.noSuchMethod(
         Invocation.method(
           #checkExerciseCacheVersion,
           [],
         ),
-        returnValue: _i6.Future<void>.value(),
-        returnValueForMissingStub: _i6.Future<void>.value(),
-      ) as _i6.Future<void>);
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.Future<void>.value(),
+      ) as _i9.Future<void>);
   @override
-  _i6.Future<void> fetchAndSetExercises() => (super.noSuchMethod(
+  _i9.Future<void> fetchAndSetExercises() => (super.noSuchMethod(
         Invocation.method(
           #fetchAndSetExercises,
           [],
         ),
-        returnValue: _i6.Future<void>.value(),
-        returnValueForMissingStub: _i6.Future<void>.value(),
-      ) as _i6.Future<void>);
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.Future<void>.value(),
+      ) as _i9.Future<void>);
   @override
-  _i6.Future<List<dynamic>> searchExercise(
+  _i9.Future<List<_i3.ExerciseBase>> searchExercise(
     String? name, [
     String? languageCode = r'en',
   ]) =>
@@ -209,102 +386,11 @@ class MockExercisesProvider extends _i1.Mock implements _i5.ExercisesProvider {
             languageCode,
           ],
         ),
-        returnValue: _i6.Future<List<dynamic>>.value(<dynamic>[]),
-      ) as _i6.Future<List<dynamic>>);
+        returnValue:
+            _i9.Future<List<_i3.ExerciseBase>>.value(<_i3.ExerciseBase>[]),
+      ) as _i9.Future<List<_i3.ExerciseBase>>);
   @override
-  Uri makeUrl(
-    String? path, {
-    int? id,
-    String? objectMethod,
-    Map<String, dynamic>? query,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #makeUrl,
-          [path],
-          {
-            #id: id,
-            #objectMethod: objectMethod,
-            #query: query,
-          },
-        ),
-        returnValue: _FakeUri_3(
-          this,
-          Invocation.method(
-            #makeUrl,
-            [path],
-            {
-              #id: id,
-              #objectMethod: objectMethod,
-              #query: query,
-            },
-          ),
-        ),
-      ) as Uri);
-  @override
-  _i6.Future<Map<String, dynamic>> fetch(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetch,
-          [uri],
-        ),
-        returnValue: _i6.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i6.Future<Map<String, dynamic>>);
-  @override
-  _i6.Future<Map<String, dynamic>> post(
-    Map<String, dynamic>? data,
-    Uri? uri,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #post,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue: _i6.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i6.Future<Map<String, dynamic>>);
-  @override
-  _i6.Future<Map<String, dynamic>> patch(
-    Map<String, dynamic>? data,
-    Uri? uri,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #patch,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue: _i6.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i6.Future<Map<String, dynamic>>);
-  @override
-  _i6.Future<_i3.Response> deleteRequest(
-    String? url,
-    int? id,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #deleteRequest,
-          [
-            url,
-            id,
-          ],
-        ),
-        returnValue: _i6.Future<_i3.Response>.value(_FakeResponse_4(
-          this,
-          Invocation.method(
-            #deleteRequest,
-            [
-              url,
-              id,
-            ],
-          ),
-        )),
-      ) as _i6.Future<_i3.Response>);
-  @override
-  void addListener(_i7.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(_i10.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -312,7 +398,7 @@ class MockExercisesProvider extends _i1.Mock implements _i5.ExercisesProvider {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i7.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(_i10.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],