diff --git a/integration_test/metering_screen_test.dart b/integration_test/metering_screen_test.dart
index 95456ef..a15c44f 100644
--- a/integration_test/metering_screen_test.dart
+++ b/integration_test/metering_screen_test.dart
@@ -127,72 +127,6 @@ void main() {
     await tester.pumpAndSettle();
   }
 
-  group(
-    'AnimatedDialog picker standalone tests',
-    () {
-      setUpAll(() {
-        when(() => mockUserPreferencesService.evSourceType).thenReturn(EvSourceType.sensor);
-        when(() => mockUserPreferencesService.iso).thenReturn(_defaultIsoValue);
-        when(() => mockUserPreferencesService.iso = _defaultIsoValue).thenReturn(_defaultIsoValue);
-      });
-
-      testWidgets(
-        'Open & close with select',
-        (tester) async {
-          await pumpApplication(tester, IAPProductStatus.purchasable);
-          await tester.openAnimatedPicker<IsoValuePicker>();
-          expect(find.byType(DialogPicker<IsoValue>), findsOneWidget);
-          await tester.tapSelectButton();
-          expect(find.byType(DialogPicker<IsoValue>), findsNothing);
-        },
-      );
-
-      testWidgets(
-        'Open & close with cancel',
-        (tester) async {
-          await pumpApplication(tester, IAPProductStatus.purchasable);
-          await tester.openAnimatedPicker<IsoValuePicker>();
-          expect(find.byType(DialogPicker<IsoValue>), findsOneWidget);
-          await tester.tapCancelButton();
-          expect(find.byType(DialogPicker<IsoValue>), findsNothing);
-        },
-      );
-
-      testWidgets(
-        'Open & close with tap outside',
-        (tester) async {
-          await pumpApplication(tester, IAPProductStatus.purchasable);
-          await tester.openAnimatedPicker<IsoValuePicker>();
-          expect(find.byType(DialogPicker<IsoValue>), findsOneWidget);
-
-          /// tester taps the center of the found widget,
-          /// which results in tap on the dialog instead of the underlying barrier
-          /// therefore just tap at offset outside the dialog
-          await tester.longPressAt(const Offset(16, 16));
-          await tester.pumpAndSettle(Dimens.durationML);
-          expect(find.byType(DialogPicker<IsoValue>), findsNothing);
-        },
-      );
-
-      testWidgets(
-        'Open & close with back gesture',
-        (tester) async {
-          await pumpApplication(tester, IAPProductStatus.purchasable);
-          await tester.openAnimatedPicker<IsoValuePicker>();
-          expect(find.byType(DialogPicker<IsoValue>), findsOneWidget);
-
-          //// https://github.com/flutter/flutter/blob/master/packages/flutter/test/widgets/router_test.dart#L970-L971
-          //// final ByteData message = const JSONMethodCodec().encodeMethodCall(const MethodCall('popRoute'));
-          //// await tester.binding.defaultBinaryMessenger.handlePlatformMessage('flutter/navigation', message, (_) {});
-          /// https://github.com/flutter/packages/blob/main/packages/animations/test/open_container_test.dart#L234
-          (tester.state(find.byType(Navigator)) as NavigatorState).pop();
-          await tester.pumpAndSettle(Dimens.durationML);
-          expect(find.byType(DialogPicker<IsoValue>), findsNothing);
-        },
-      );
-    },
-  );
-
   group(
     'Free version',
     () {
diff --git a/test/screens/metering/components/shared/animated_dialog_picker_test.dart b/test/screens/metering/components/shared/animated_dialog_picker_test.dart
new file mode 100644
index 0000000..73af0b3
--- /dev/null
+++ b/test/screens/metering/components/shared/animated_dialog_picker_test.dart
@@ -0,0 +1,131 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:lightmeter/generated/l10n.dart';
+import 'package:lightmeter/res/dimens.dart';
+import 'package:lightmeter/res/theme.dart';
+import 'package:lightmeter/screens/metering/components/shared/readings_container/components/iso_picker/widget_picker_iso.dart';
+import 'package:lightmeter/screens/metering/components/shared/readings_container/components/shared/animated_dialog_picker/components/dialog_picker/widget_picker_dialog.dart';
+import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
+
+void main() {
+  group(
+    'Open & close tests',
+    () {
+      testWidgets(
+        'Open & close with select',
+        (tester) async {
+          await tester.pumpApplication();
+          await tester.openAnimatedPicker<IsoValuePicker>();
+          expect(find.byType(DialogPicker<IsoValue>), findsOneWidget);
+          await tester.tapSelectButton();
+          expect(find.byType(DialogPicker<IsoValue>), findsNothing);
+        },
+      );
+
+      testWidgets(
+        'Open & close with cancel',
+        (tester) async {
+          await tester.pumpApplication();
+          await tester.openAnimatedPicker<IsoValuePicker>();
+          expect(find.byType(DialogPicker<IsoValue>), findsOneWidget);
+          await tester.tapCancelButton();
+          expect(find.byType(DialogPicker<IsoValue>), findsNothing);
+        },
+      );
+
+      testWidgets(
+        'Open & close with tap outside',
+        (tester) async {
+          await tester.pumpApplication();
+          await tester.openAnimatedPicker<IsoValuePicker>();
+          expect(find.byType(DialogPicker<IsoValue>), findsOneWidget);
+
+          /// tester taps the center of the found widget,
+          /// which results in tap on the dialog instead of the underlying barrier
+          /// therefore just tap at offset outside the dialog
+          await tester.longPressAt(const Offset(16, 16));
+          await tester.pumpAndSettle(Dimens.durationML);
+          expect(find.byType(DialogPicker<IsoValue>), findsNothing);
+        },
+      );
+
+      testWidgets(
+        'Open & close with back gesture',
+        (tester) async {
+          await tester.pumpApplication();
+          await tester.openAnimatedPicker<IsoValuePicker>();
+          expect(find.byType(DialogPicker<IsoValue>), findsOneWidget);
+
+          //// https://github.com/flutter/flutter/blob/master/packages/flutter/test/widgets/router_test.dart#L970-L971
+          //// final ByteData message = const JSONMethodCodec().encodeMethodCall(const MethodCall('popRoute'));
+          //// await tester.binding.defaultBinaryMessenger.handlePlatformMessage('flutter/navigation', message, (_) {});
+          /// https://github.com/flutter/packages/blob/main/packages/animations/test/open_container_test.dart#L234
+          (tester.state(find.byType(Navigator)) as NavigatorState).pop();
+          await tester.pumpAndSettle(Dimens.durationML);
+          expect(find.byType(DialogPicker<IsoValue>), findsNothing);
+        },
+      );
+    },
+  );
+}
+
+extension WidgetTesterActions on WidgetTester {
+  Future<void> pumpApplication() async {
+    await pumpWidget(
+      MaterialApp(
+        title: 'Flutter Demo',
+        theme: themeFrom(primaryColorsList[5], Brightness.light),
+        locale: const Locale('en'),
+        localizationsDelegates: const [
+          S.delegate,
+          GlobalMaterialLocalizations.delegate,
+          GlobalWidgetsLocalizations.delegate,
+          GlobalCupertinoLocalizations.delegate,
+        ],
+        supportedLocales: S.delegate.supportedLocales,
+        builder: (context, child) => MediaQuery(
+          data: MediaQuery.of(context).copyWith(textScaleFactor: 1.0),
+          child: child!,
+        ),
+        home: Scaffold(
+          body: Row(
+            children: [
+              Expanded(
+                child: IsoValuePicker(
+                  selectedValue: const IsoValue(400, StopType.full),
+                  values: IsoValue.values,
+                  onChanged: (_) {},
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+    await pumpAndSettle();
+  }
+
+  Future<void> openAnimatedPicker<T>() async {
+    await tap(find.byType(T));
+    await pumpAndSettle(Dimens.durationL);
+  }
+
+  Future<void> tapSelectButton() async {
+    final cancelButton = find.byWidgetPredicate(
+      (widget) => widget is TextButton && widget.child is Text && (widget.child as Text?)?.data == S.current.select,
+    );
+    expect(cancelButton, findsOneWidget);
+    await tap(cancelButton);
+    await pumpAndSettle();
+  }
+
+  Future<void> tapCancelButton() async {
+    final cancelButton = find.byWidgetPredicate(
+      (widget) => widget is TextButton && widget.child is Text && (widget.child as Text?)?.data == S.current.cancel,
+    );
+    expect(cancelButton, findsOneWidget);
+    await tap(cancelButton);
+    await pumpAndSettle();
+  }
+}