diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index 248d6d1a..02dccb0d 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -107,7 +107,7 @@ jobs:
           # - { name: onchain_boost_receive_widgets, grep: "@onchain|@boost|@receive|@widgets" }
           # - { name: settings, grep: "@settings" }
           # - { name: security, grep: "@security" }
-          - { name: e2e, grep: '^(?!.*@settings_10)(@onboarding|@onchain_1|@numberpad|@widgets|@boost|@receive|@settings|@security)' }
+          - { name: e2e, grep: '^(?!.*@settings_10)(@onboarding|@onchain_1|@onchain_2|@numberpad|@widgets|@boost|@receive|@settings|@security)' }
 
     name: e2e-tests - ${{ matrix.shard.name }}
 
diff --git a/Bitkit/Components/Activity/ActivityListFilter.swift b/Bitkit/Components/Activity/ActivityListFilter.swift
index df98981a..8bf3f979 100644
--- a/Bitkit/Components/Activity/ActivityListFilter.swift
+++ b/Bitkit/Components/Activity/ActivityListFilter.swift
@@ -37,6 +37,7 @@ struct ActivityListFilter: View {
                     .onTapGesture {
                         showingTagSelector = true
                     }
+                    .accessibilityIdentifier("TagsPrompt")
                 Image("calendar")
                     .resizable()
                     .frame(width: 24, height: 24)
@@ -44,6 +45,7 @@ struct ActivityListFilter: View {
                     .onTapGesture {
                         showingDateRange = true
                     }
+                    .accessibilityIdentifier("DatePicker")
             }
         }
         .frame(width: .infinity, height: 48)
diff --git a/Bitkit/Components/Activity/DateRangeSelectorSheet.swift b/Bitkit/Components/Activity/DateRangeSelectorSheet.swift
index f2946226..9418557f 100644
--- a/Bitkit/Components/Activity/DateRangeSelectorSheet.swift
+++ b/Bitkit/Components/Activity/DateRangeSelectorSheet.swift
@@ -182,6 +182,7 @@ struct DateRangeSelectorSheet: View {
                         startDate = nil
                         endDate = nil
                         viewModel.clearDateRange()
+                        isPresented = false
                     }
                     .accessibilityIdentifier("CalendarClearButton")
 
diff --git a/Bitkit/Components/SegmentedControl.swift b/Bitkit/Components/SegmentedControl.swift
index 89ebdeff..fcf4c67a 100644
--- a/Bitkit/Components/SegmentedControl.swift
+++ b/Bitkit/Components/SegmentedControl.swift
@@ -55,6 +55,7 @@ struct SegmentedControl<T: Hashable & CustomStringConvertible>: View {
                     .contentShape(Rectangle())
                 }
                 .buttonStyle(PlainButtonStyle())
+                .accessibilityIdentifier("Tab-\(tabItem.tab.description.lowercased())")
             }
         }
         .frame(maxWidth: .infinity)
diff --git a/Bitkit/Components/SheetIntro.swift b/Bitkit/Components/SheetIntro.swift
index 19674ed0..2bb37c83 100644
--- a/Bitkit/Components/SheetIntro.swift
+++ b/Bitkit/Components/SheetIntro.swift
@@ -91,7 +91,7 @@ struct SheetIntro: View {
                 ) {
                     onContinue()
                 }
-                .accessibilityIdentifier("\(baseTestID)-button-continue")
+                .accessibilityIdentifier("\(baseTestID)Continue")
             }
         } else {
             CustomButton(
@@ -99,7 +99,7 @@ struct SheetIntro: View {
             ) {
                 onContinue()
             }
-            .accessibilityIdentifier("\(baseTestID)-button-continue")
+            .accessibilityIdentifier("\(baseTestID)Continue")
         }
     }
 }
diff --git a/Bitkit/Components/Tag.swift b/Bitkit/Components/Tag.swift
index a7eda759..ecfbd21e 100644
--- a/Bitkit/Components/Tag.swift
+++ b/Bitkit/Components/Tag.swift
@@ -48,6 +48,8 @@ struct Tag: View {
         )
         .cornerRadius(8)
         .fixedSize(horizontal: true, vertical: false)
+        .accessibilityElement(children: .contain)
+        .accessibilityIdentifier("Tag-\(value)")
     }
 
     var body: some View {
@@ -55,7 +57,6 @@ struct Tag: View {
             Button(action: onPress) {
                 tagContent
             }
-            .accessibilityIdentifier("Tag-\(value)")
             .buttonStyle(.plain) // Use plain button style to avoid default button appearance interfering
         } else {
             tagContent
diff --git a/Bitkit/Views/Wallets/Send/SendConfirmationView.swift b/Bitkit/Views/Wallets/Send/SendConfirmationView.swift
index 4dce7c73..0126a43c 100644
--- a/Bitkit/Views/Wallets/Send/SendConfirmationView.swift
+++ b/Bitkit/Views/Wallets/Send/SendConfirmationView.swift
@@ -97,7 +97,8 @@ struct SendConfirmationView: View {
                 },
                 onAddTag: {
                     navigationPath.append(.tag)
-                }
+                },
+                buttonTestId: "TagsAddSend"
             )
 
             Spacer()
diff --git a/Bitkit/Views/Wallets/Send/SendTagScreen.swift b/Bitkit/Views/Wallets/Send/SendTagScreen.swift
index 9396f9fc..8cd01932 100644
--- a/Bitkit/Views/Wallets/Send/SendTagScreen.swift
+++ b/Bitkit/Views/Wallets/Send/SendTagScreen.swift
@@ -18,7 +18,9 @@ struct SendTagScreen: View {
 
             TagInputForm(
                 tagText: $newTagText,
-                isTextFieldFocused: $isTextFieldFocused
+                isTextFieldFocused: $isTextFieldFocused,
+                textFieldTestId: "TagInputSend",
+                buttonTestId: "SendTagsSubmit"
             ) { tag in
                 await addTag(tag)
             }