diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/BitwardenTextFieldWithActions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/BitwardenTextFieldWithActions.kt
index 44907b4cff..0094755bdc 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/BitwardenTextFieldWithActions.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/BitwardenTextFieldWithActions.kt
@@ -28,13 +28,19 @@ import com.x8bit.bitwarden.ui.platform.theme.BitwardenTheme
  * @param value Current text in the text field.
  * @param onValueChange Callback that is triggered when the text content changes.
  * @param modifier [Modifier] applied to this layout composable.
+ * @param textStyle The [TextStyle], or null if default.
+ * @param shouldAddCustomLineBreaks If `true`, line breaks will be inserted to allow for filling
+ * an entire line before breaking. `false` by default.
+ * @param visualTransformation Transforms the visual representation of the input [value].
  * @param readOnly `true` if the input should be read-only and not accept user interactions.
  * @param singleLine when `true`, this text field becomes a single line that horizontally scrolls
  * instead of wrapping onto multiple lines.
+ * @param keyboardType the preferred type of keyboard input.
  * @param trailingIconContent the content for the trailing icon in the text field.
  * @param actions A lambda containing the set of actions (usually icons or similar) to display
  * next to the text field. This lambda extends [RowScope],
  * providing flexibility in the layout definition.
+ * @param actionsTestTag The test tag to use for the row of actions, or null if there is none.
  * @param textFieldTestTag The test tag to be used on the text field.
  */
 @Composable
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditLoginItems.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditLoginItems.kt
index 21494cc72a..14c5cfd867 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditLoginItems.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditLoginItems.kt
@@ -109,8 +109,7 @@ fun LazyListScope.vaultAddEditLoginItems(
             BitwardenTextFieldWithActions(
                 modifier = Modifier
                     .fillMaxWidth()
-                    .padding(horizontal = 16.dp)
-                    .testTag("LoginTotpEntry"),
+                    .padding(horizontal = 16.dp),
                 label = stringResource(id = R.string.totp),
                 value = loginState.totp,
                 trailingIconContent = {
@@ -144,6 +143,7 @@ fun LazyListScope.vaultAddEditLoginItems(
                         onClick = onTotpSetupClick,
                     )
                 },
+                textFieldTestTag = "LoginTotpEntry",
             )
         }
     } else {
@@ -398,8 +398,8 @@ private fun UsernameRow(
             )
         },
         modifier = Modifier
-            .testTag("LoginUsernameEntry")
             .padding(horizontal = 16.dp),
+        textFieldTestTag = "LoginUsernameEntry",
     )
 
     if (shouldShowDialog) {
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditUriItem.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditUriItem.kt
index 044a4bcab8..182bfa8407 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditUriItem.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditUriItem.kt
@@ -51,8 +51,8 @@ fun VaultAddEditUriItem(
             )
         },
         modifier = Modifier
-            .testTag("LoginUriEntry")
             .padding(horizontal = 16.dp),
+        textFieldTestTag = "LoginUriEntry",
     )
 
     if (shouldShowOptionsDialog) {
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemLoginContent.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemLoginContent.kt
index c4489e37c2..75f75f81f4 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemLoginContent.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemLoginContent.kt
@@ -120,7 +120,6 @@ fun VaultItemLoginContent(
                     isPremiumUser = loginItemState.isPremiumUser,
                     onCopyTotpClick = vaultLoginItemTypeHandlers.onCopyTotpCodeClick,
                     modifier = Modifier
-                        .testTag("LoginTotpEntry")
                         .fillMaxWidth()
                         .padding(horizontal = 16.dp),
                 )
@@ -396,6 +395,7 @@ private fun TotpField(
                     )
                 },
                 modifier = modifier,
+                textFieldTestTag = "LoginTotpEntry",
             )
         }
     } else {