diff --git a/test_driver/products_it_test.dart b/test_driver/products_it_test.dart
index a183fbd00..14a822f12 100644
--- a/test_driver/products_it_test.dart
+++ b/test_driver/products_it_test.dart
@@ -64,22 +64,12 @@ void main() {
       await driver.tap(find.byTooltip(localization.newProduct));
 
       print('Fill form: $productKey');
-      await fillTextFields(driver, <String, dynamic>{
+      await fillAndSaveForm(driver, <String, dynamic>{
         localization.productKey: productKey,
         localization.notes: notes,
         localization.cost: cost,
       });
 
-      print('Tap save');
-      await driver.tap(find.text(localization.save));
-      //await driver.waitFor(find.text(localization.createdProduct));
-      await driver.waitFor(find.text(productKey));
-
-      print('Check for new value: $productKey');
-      await driver.waitFor(find.text(productKey));
-      await driver.waitFor(find.text(notes));
-      //await driver.waitFor(find.text(cost));
-
       if (await isMobile(driver)) {
         print('Click back');
         await driver.tap(find.pageBack());
@@ -97,54 +87,20 @@ void main() {
         await driver.tap(find.text(productKey));
       }
 
-      print('Tap edit');
-      await driver.tap(find.text(localization.edit));
-
-      print('Fill in form: $updatedProductKey');
-      await fillTextFields(driver, <String, dynamic>{
+      await fillAndSaveForm(driver, <String, dynamic>{
         localization.productKey: updatedProductKey,
         localization.notes: updatedNotes,
         localization.cost: updatedCost,
       });
-
-      print('Tap save');
-      await driver.tap(find.text(localization.save));
-
-      // verify snackbar
-      //await driver.waitFor(find.text(localization.updatedProduct));
-      //await driver.tap(find.pageBack());
-
-      print('Check for updated values');
-      await driver.waitFor(find.text(updatedProductKey));
-      await driver.waitFor(find.text(updatedNotes));
-      //await driver.waitFor(find.text(updatedCost));
     });
 
     // Archive the edited product
-    test('Archieve a product test', () async {
-      print('Archive product');
-      await driver.tap(find.byType('ActionMenuButton'));
-      await driver.tap(find.text(localization.archive));
-      await driver.waitFor(find.text(localization.archivedProduct));
-      await driver.waitFor(find.text(localization.archived));
-
-      print('Restore product');
-      await driver.tap(find.byType('ActionMenuButton'));
-      await driver.tap(find.text(localization.restore));
-      await driver.waitFor(find.text(localization.restoredProduct));
-      await driver.waitForAbsent(find.text(localization.archived));
-
-      print('Delete product');
-      await driver.tap(find.byType('ActionMenuButton'));
-      await driver.tap(find.text(localization.delete));
-      await driver.waitFor(find.text(localization.deletedProduct));
-      await driver.waitFor(find.text(localization.deleted));
-
-      print('Restore product');
-      await driver.tap(find.byType('ActionMenuButton'));
-      await driver.tap(find.text(localization.restore));
-      await driver.waitFor(find.text(localization.restoredProduct));
-      await driver.waitForAbsent(find.text(localization.deleted));
+    test('Archieve/delete product test', () async {
+      testArchiveAndDelete(
+          driver: driver,
+          archivedMessage: localization.archivedProduct,
+          deletedMessage: localization.deletedProduct,
+          restoredMessage: localization.restoredProduct);
 
       if (await isMobile(driver)) {
         await driver.tap(find.pageBack());
diff --git a/test_driver/utils/common_actions.dart b/test_driver/utils/common_actions.dart
index e0ef7b764..0ae90e6c7 100644
--- a/test_driver/utils/common_actions.dart
+++ b/test_driver/utils/common_actions.dart
@@ -94,5 +94,64 @@ Future<void> fillTextFields(
   }
 }
 
+Future<void> checkTextFields(
+    FlutterDriver driver, Map<String, dynamic> values) async {
+  for (var entry in values.entries) {
+    await driver.waitFor(find.text(entry.value));
+  }
+}
+
+Future<void> fillAndSaveForm(
+    FlutterDriver driver, Map<String, dynamic> values) async {
+  print('Tap edit');
+  final localization = TestLocalization('en');
+  await driver.tap(find.text(localization.edit));
+
+  print('Fill in form');
+  await fillTextFields(driver, values);
+
+  print('Tap save');
+  await driver.tap(find.text(localization.save));
+
+  // verify snackbar
+  //await driver.waitFor(find.text(localization.updatedProduct));
+  //await driver.tap(find.pageBack());
+
+  print('Check for updated values');
+  await checkTextFields(driver, values);
+}
+
+Future<void> testArchiveAndDelete(
+    {FlutterDriver driver,
+    String archivedMessage,
+    String deletedMessage,
+    String restoredMessage}) async {
+  final localization = TestLocalization('en');
+
+  print('Archive record');
+  await driver.tap(find.byType('ActionMenuButton'));
+  await driver.tap(find.text(localization.archive));
+  await driver.waitFor(find.text(archivedMessage));
+  await driver.waitFor(find.text(localization.archived));
+
+  print('Restore record');
+  await driver.tap(find.byType('ActionMenuButton'));
+  await driver.tap(find.text(localization.restore));
+  await driver.waitFor(find.text(restoredMessage));
+  await driver.waitForAbsent(find.text(localization.archived));
+
+  print('Delete record');
+  await driver.tap(find.byType('ActionMenuButton'));
+  await driver.tap(find.text(localization.delete));
+  await driver.waitFor(find.text(deletedMessage));
+  await driver.waitFor(find.text(localization.deleted));
+
+  print('Restore record');
+  await driver.tap(find.byType('ActionMenuButton'));
+  await driver.tap(find.text(localization.restore));
+  await driver.waitFor(find.text(restoredMessage));
+  await driver.waitForAbsent(find.text(localization.deleted));
+}
+
 String makeUnique(String value) =>
     '$value ${faker.randomGenerator.integer(999999, min: 100000)}';