diff --git a/ts/components/MemberListItem.tsx b/ts/components/MemberListItem.tsx
index cd7c96c18..6cdd70a94 100644
--- a/ts/components/MemberListItem.tsx
+++ b/ts/components/MemberListItem.tsx
@@ -1,6 +1,7 @@
 import styled from 'styled-components';
 
 import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs';
+import { isEmpty } from 'lodash';
 import { useNicknameOrProfileNameOrShortenedPubkey } from '../hooks/useParamSelector';
 import { promoteUsersInGroup } from '../interactions/conversationInteractions';
 import { PubKey } from '../session/types';
@@ -35,7 +36,6 @@ import {
   MetaGroupWrapperActions,
   UserGroupsWrapperActions,
 } from '../webworker/workers/browser/libsession_worker_interface';
-import { isEmpty } from 'lodash';
 
 const AvatarContainer = styled.div`
   position: relative;
@@ -191,7 +191,7 @@ const GroupStatusText = ({ groupPk, pubkey }: { pubkey: PubkeyType; groupPk: Gro
   }
   return (
     <StyledGroupStatusText
-      data-testid={'group-member-status-text'}
+      data-testid={'contact-status'}
       isFailure={
         (groupPromotionFailed && !groupPromotionSending) ||
         (groupInviteFailed && !groupInviteSending)
@@ -353,7 +353,7 @@ export const MemberListItem = ({
           margin="0 var(--margins-md)"
           alignItems="flex-start"
         >
-          <StyledName data-testid={'group-member-name'} maxName={maxNameWidth}>
+          <StyledName data-testid={'contact'} maxName={maxNameWidth}>
             {ourName || memberName}
           </StyledName>
           <GroupStatusContainer
@@ -368,7 +368,13 @@ export const MemberListItem = ({
 
       {!inMentions && !hideRadioButton && (
         <StyledCheckContainer>
-          <SessionRadio active={isSelected} value={pubkey} inputName={pubkey} label="" />
+          <SessionRadio
+            active={isSelected}
+            value={pubkey}
+            inputName={pubkey}
+            label=""
+            inputDataTestId="select-contact"
+          />
         </StyledCheckContainer>
       )}
     </StyledSessionMemberItem>
diff --git a/ts/components/NoticeBanner.tsx b/ts/components/NoticeBanner.tsx
index 659870166..a8d1e432e 100644
--- a/ts/components/NoticeBanner.tsx
+++ b/ts/components/NoticeBanner.tsx
@@ -72,7 +72,7 @@ const StyledGroupInviteBanner = styled(Flex)`
 
 export const GroupInviteRequiredVersionBanner = () => {
   return (
-    <StyledGroupInviteBanner data-testid="invite-warning">
+    <StyledGroupInviteBanner data-testid="version-warning">
       {window.i18n('groupInviteVersion')}
     </StyledGroupInviteBanner>
   );
diff --git a/ts/components/dialog/InviteContactsDialog.tsx b/ts/components/dialog/InviteContactsDialog.tsx
index 5f7b95ecf..883a9a938 100644
--- a/ts/components/dialog/InviteContactsDialog.tsx
+++ b/ts/components/dialog/InviteContactsDialog.tsx
@@ -14,7 +14,7 @@ import {
   useIsPrivate,
   useIsPublic,
   useSortedGroupMembers,
-  useZombies
+  useZombies,
 } from '../../hooks/useParamSelector';
 import { useSet } from '../../hooks/useSet';
 import { ClosedGroup } from '../../session/group/closed-group';
diff --git a/ts/components/dialog/OpenUrlModal.tsx b/ts/components/dialog/OpenUrlModal.tsx
index db5ff30f9..e1eef5647 100644
--- a/ts/components/dialog/OpenUrlModal.tsx
+++ b/ts/components/dialog/OpenUrlModal.tsx
@@ -57,7 +57,7 @@ export function OpenUrlModal(props: OpenUrlModalState) {
           buttonColor={SessionButtonColor.Danger}
           buttonType={SessionButtonType.Simple}
           onClick={onClickOpen}
-          dataTestId="session-confirm-ok-button"
+          dataTestId="open-url-confirm-button"
         />
         <SessionButton
           text={window.i18n('urlCopy')}
diff --git a/ts/react.d.ts b/ts/react.d.ts
index dd2060122..43b7e429a 100644
--- a/ts/react.d.ts
+++ b/ts/react.d.ts
@@ -172,6 +172,11 @@ declare module 'react' {
     // to sort
     | 'restore-using-recovery'
     | 'link-device'
+    | 'select-contact'
+    | 'contact' // this is way too generic
+    | 'contact-status'
+    | 'version-warning'
+    | 'open-url-confirm-button'
     | 'continue-session-button'
     | 'next-new-conversation-button'
     | 'reveal-recovery-phrase'