diff --git a/lib/screens/settings/screen_settings.dart b/lib/screens/settings/screen_settings.dart
index c010b2d..c6c7788 100644
--- a/lib/screens/settings/screen_settings.dart
+++ b/lib/screens/settings/screen_settings.dart
@@ -23,7 +23,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
   void didChangeDependencies() {
     super.didChangeDependencies();
     SettingsInteractorProvider.of(context).disableVolumeHandling();
-    IAPProductsProvider.of(context).checkIsPro();
+    IAPProductsProvider.maybeOf(context)?.checkIsPro();
   }
 
   @override
diff --git a/test/application_mock.dart b/test/application_mock.dart
index 080cfa1..693397c 100644
--- a/test/application_mock.dart
+++ b/test/application_mock.dart
@@ -99,8 +99,23 @@ class _GoldenTestApplicationMockState extends State<GoldenTestApplicationMock> {
 
   @override
   Widget build(BuildContext context) {
-    return MockIapProducts(
+    return IAPProducts(
       isPro: widget.isPro,
+      lifetime: const IAPProduct(
+        storeId: '',
+        type: PurchaseType.lifetime,
+        price: '0.0\$',
+      ),
+      yearly: const IAPProduct(
+        storeId: '',
+        type: PurchaseType.yearly,
+        price: '0.0\$',
+      ),
+      monthly: const IAPProduct(
+        storeId: '',
+        type: PurchaseType.monthly,
+        price: '0.0\$',
+      ),
       child: _MockApplicationWrapper(
         child: MockIAPProviders(
           selectedEquipmentProfileId: mockEquipmentProfiles.first.id,
@@ -169,26 +184,3 @@ class _MockApplicationWrapper extends StatelessWidget {
     );
   }
 }
-
-class MockIapProducts extends IAPProducts {
-  MockIapProducts({
-    required super.isPro,
-    required super.child,
-  }) : super(
-          lifetime: IAPProduct(
-            storeId: '',
-            type: PurchaseType.lifetime,
-            price: '0.0\$',
-          ),
-          yearly: IAPProduct(
-            storeId: '',
-            type: PurchaseType.yearly,
-            price: '0.0\$',
-          ),
-          monthly: IAPProduct(
-            storeId: '',
-            type: PurchaseType.monthly,
-            price: '0.0\$',
-          ),
-        );
-}
diff --git a/test/providers/equipment_profile_provider_test.dart b/test/providers/equipment_profile_provider_test.dart
index f1891f5..8aacb8b 100644
--- a/test/providers/equipment_profile_provider_test.dart
+++ b/test/providers/equipment_profile_provider_test.dart
@@ -5,8 +5,6 @@ import 'package:m3_lightmeter_iap/m3_lightmeter_iap.dart';
 import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
 import 'package:mocktail/mocktail.dart';
 
-import '../application_mock.dart';
-
 class _MockEquipmentProfilesStorageService extends Mock implements IapStorageService {}
 
 void main() {
@@ -37,7 +35,7 @@ void main() {
 
   Future<void> pumpTestWidget(WidgetTester tester, bool isPro) async {
     await tester.pumpWidget(
-      MockIapProducts(
+      IAPProducts(
         isPro: isPro,
         child: EquipmentProfilesProvider(
           storageService: storageService,
diff --git a/test/providers/films_provider_test.dart b/test/providers/films_provider_test.dart
index 296292a..97b6ec7 100644
--- a/test/providers/films_provider_test.dart
+++ b/test/providers/films_provider_test.dart
@@ -5,8 +5,6 @@ import 'package:m3_lightmeter_iap/m3_lightmeter_iap.dart';
 import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
 import 'package:mocktail/mocktail.dart';
 
-import '../application_mock.dart';
-
 class _MockFilmsStorageService extends Mock implements IapStorageService {}
 
 void main() {
@@ -34,7 +32,7 @@ void main() {
 
   Future<void> pumpTestWidget(WidgetTester tester, bool isPro) async {
     await tester.pumpWidget(
-      MockIapProducts(
+      IAPProducts(
         isPro: isPro,
         child: FilmsProvider(
           storageService: storageService,
diff --git a/test/providers/logbook_photos_provider_test.dart b/test/providers/logbook_photos_provider_test.dart
index 531e1cd..e0999d1 100644
--- a/test/providers/logbook_photos_provider_test.dart
+++ b/test/providers/logbook_photos_provider_test.dart
@@ -6,8 +6,6 @@ import 'package:m3_lightmeter_iap/m3_lightmeter_iap.dart';
 import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
 import 'package:mocktail/mocktail.dart';
 
-import '../application_mock.dart';
-
 class _MockLogbookPhotosStorageService extends Mock implements IapStorageService {}
 
 class _MockGeolocationService extends Mock implements GeolocationService {}
@@ -47,7 +45,7 @@ void main() {
 
   Future<void> pumpTestWidget(WidgetTester tester, bool isPro) async {
     await tester.pumpWidget(
-      MockIapProducts(
+      IAPProducts(
         isPro: isPro,
         child: LogbookPhotosProvider(
           storageService: storageService,
diff --git a/test/screens/lightmeter_pro/goldens/lightmeter_pro_screen.png b/test/screens/lightmeter_pro/goldens/lightmeter_pro_screen.png
index 883eed5..d04fdec 100644
Binary files a/test/screens/lightmeter_pro/goldens/lightmeter_pro_screen.png and b/test/screens/lightmeter_pro/goldens/lightmeter_pro_screen.png differ
diff --git a/test/screens/metering/components/shared/readings_container/equipment_profile_picker_test.dart b/test/screens/metering/components/shared/readings_container/equipment_profile_picker_test.dart
index 17f7fa0..d66b01d 100644
--- a/test/screens/metering/components/shared/readings_container/equipment_profile_picker_test.dart
+++ b/test/screens/metering/components/shared/readings_container/equipment_profile_picker_test.dart
@@ -25,7 +25,7 @@ void main() {
 
   Future<void> pumpApplication(WidgetTester tester) async {
     await tester.pumpWidget(
-      MockIapProducts(
+      IAPProducts(
         isPro: true,
         child: EquipmentProfilesProvider(
           storageService: storageService,
diff --git a/test/screens/metering/components/shared/readings_container/film_picker_test.dart b/test/screens/metering/components/shared/readings_container/film_picker_test.dart
index b411047..8fc4f9d 100644
--- a/test/screens/metering/components/shared/readings_container/film_picker_test.dart
+++ b/test/screens/metering/components/shared/readings_container/film_picker_test.dart
@@ -27,7 +27,7 @@ void main() {
 
   Future<void> pumpApplication(WidgetTester tester) async {
     await tester.pumpWidget(
-      MockIapProducts(
+      IAPProducts(
         isPro: true,
         child: FilmsProvider(
           storageService: mockFilmsStorageService,
diff --git a/test/screens/metering/utils/listener_equipment_profiles_test.dart b/test/screens/metering/utils/listener_equipment_profiles_test.dart
index 25c21a8..cf04ef4 100644
--- a/test/screens/metering/utils/listener_equipment_profiles_test.dart
+++ b/test/screens/metering/utils/listener_equipment_profiles_test.dart
@@ -6,7 +6,6 @@ import 'package:m3_lightmeter_iap/m3_lightmeter_iap.dart';
 import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
 import 'package:mocktail/mocktail.dart';
 
-import '../../../application_mock.dart';
 import '../../../function_mock.dart';
 
 class _MockEquipmentProfilesStorageService extends Mock implements IapStorageService {}
@@ -36,7 +35,7 @@ void main() {
 
   Future<void> pumpTestWidget(WidgetTester tester) async {
     await tester.pumpWidget(
-      MockIapProducts(
+      IAPProducts(
         isPro: true,
         child: EquipmentProfilesProvider(
           storageService: storageService,