diff --git a/.github/workflows/flutter.yml b/.github/workflows/flutter.yml
index c843ac1..5352737 100644
--- a/.github/workflows/flutter.yml
+++ b/.github/workflows/flutter.yml
@@ -50,15 +50,13 @@ jobs:
         # keyAlias="${{ secrets.KEY_ALIAS }}
         # storeFile=keystore.jks
         run: |
-          echo "keyPassword=${{ secrets.KEY_PASSWORD }}" > ./android/key.properties
-          echo "storePassword=${{ secrets.STORE_PASSWORD }}" >> ./android/key.properties
-          echo "keyAlias=${{ secrets.KEY_ALIAS }}" >> ./android/key.properties
-          echo "storeFile=keystore.jks" >> ./android/key.properties
+          echo keyPassword="${{ secrets.KEY_PASSWORD }}" > ./android/key.properties
+          echo storePassword="${{ secrets.STORE_PASSWORD }}" >> ./android/key.properties
+          echo keyAlias="${{ secrets.KEY_ALIAS }}" >> ./android/key.properties
+          echo storeFile=keystore.jks >> ./android/key.properties
           echo "${{ secrets.KEY_JKS }}" | base64 --decode > ./android/app/keystore.jks
-          echo 
 
-      
-      - run: flutter build apk
+      # - run: flutter build apk
 
       - run: flutter build appbundle
 
diff --git a/integration_test/app_test.dart b/integration_test/app_test.dart
index 46fe1b7..a3dac63 100644
--- a/integration_test/app_test.dart
+++ b/integration_test/app_test.dart
@@ -37,7 +37,7 @@ void main() {
           userIdentifier: userIdentifier,
           password: password,
           elnUrl: elnUrl,
-          validationUser: 'User1 Complat');
+          validationUser: 'User6 Complat');
 
       devPrint('open task list');
       await menuScreenRobot.openTaskList();
diff --git a/integration_test/robots/archive_robot.dart b/integration_test/robots/archive_robot.dart
index 81ce764..4fc578b 100644
--- a/integration_test/robots/archive_robot.dart
+++ b/integration_test/robots/archive_robot.dart
@@ -1,4 +1,4 @@
-import 'package:chemobile/components/weighted_sample_archive_entry.dart';
+import 'package:chemobile/components/archive_entry.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter/material.dart';
 
@@ -11,11 +11,11 @@ class ArchiveRobot {
     await tester.pumpAndSettle();
     await _validateArchiveScreen();
 
-    expect(find.byType(WeightedSampleArchiveEntry), findsNWidgets(count));
+    expect(find.byType(ArchiveEntry), findsNWidgets(count));
   }
 
   Future<void> openFirstScan() async {
-    await tester.tap(find.byType(WeightedSampleArchiveEntry).first);
+    await tester.tap(find.byType(ArchiveEntry).first);
   }
 
   Future<void> _validateArchiveScreen() async {
diff --git a/integration_test/robots/menu_screen_robot.dart b/integration_test/robots/menu_screen_robot.dart
index 614c5e3..de0e449 100644
--- a/integration_test/robots/menu_screen_robot.dart
+++ b/integration_test/robots/menu_screen_robot.dart
@@ -8,11 +8,11 @@ class MenuScreenRobot {
 
   Future<void> openTaskList() async {
     await tester.pumpAndSettle();
-    await tester.tap(find.widgetWithText(ListTile, 'Weighted samples'));
+    await tester.tap(find.widgetWithText(ListTile, 'Unfinished tasks'));
   }
 
   Future<void> openArchive() async {
     await tester.pumpAndSettle();
-    await tester.tap(find.widgetWithText(ListTile, 'Previous Scans'));
+    await tester.tap(find.widgetWithText(ListTile, 'Finished tasks'));
   }
 }
diff --git a/integration_test/robots/task_list_robot.dart b/integration_test/robots/task_list_robot.dart
index a95a167..35f933f 100644
--- a/integration_test/robots/task_list_robot.dart
+++ b/integration_test/robots/task_list_robot.dart
@@ -10,7 +10,7 @@ class TaskListRobot {
     await tester.pumpAndSettle();
     _validateTaskList();
 
-    await tester.tap(find.widgetWithIcon(FloatingActionButton, Icons.settings_overscan));
+    await tester.tap(find.widgetWithText(BottomNavigationBar, 'Start single scan'));
   }
 
   Future<void> backToMenuScreen() async {
@@ -21,6 +21,6 @@ class TaskListRobot {
   }
 
   void _validateTaskList() async {
-    expect(find.widgetWithText(AppBar, 'Weighted sample tasks'), findsOneWidget);
+    expect(find.widgetWithText(AppBar, 'Finished tasks'), findsOneWidget);
   }
 }