diff --git a/.gitignore b/.gitignore
index c65c4c5b..ab8fcd9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,6 +44,7 @@ web-build/
 
 # Detox
 artifacts/
+.artifacts/
 
 # Diagnostic reports (https://nodejs.org/api/report.html)
 report/
diff --git a/src/components/Button.tsx b/src/components/Button.tsx
index fb33c89b..bef2502e 100644
--- a/src/components/Button.tsx
+++ b/src/components/Button.tsx
@@ -106,7 +106,7 @@ export function TxtButton({ txt, onPress, icon, disabled, style, txtColor }: ITx
 			style={[styles.copyTxt, ...(style || [])]}
 			onPress={onPress}
 			disabled={disabled}
-			testID={`${txt}-pin-button`}
+			testID={`${txt}-button`}
 		>
 			<Txt
 				txt={txt}
diff --git a/src/components/InitialModal.tsx b/src/components/InitialModal.tsx
deleted file mode 100644
index 225628a2..00000000
--- a/src/components/InitialModal.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import MyModal from '@modal'
-import { useThemeContext } from '@src/context/Theme'
-import { NS } from '@src/i18n'
-import { globals } from '@styles'
-import { useTranslation } from 'react-i18next'
-import { Text } from 'react-native'
-
-import Button, { TxtButton } from './Button'
-
-interface IInitialModalProps {
-	visible: boolean
-	onConfirm: () => void
-	onCancel: () => void
-}
-
-export default function InitialModal({ visible, onConfirm, onCancel }: IInitialModalProps) {
-	const { t } = useTranslation([NS.common])
-	const { color, highlight } = useThemeContext()
-	return (
-		<MyModal type='bottom' animation='slide' visible={visible} close={onCancel}>
-			<Text
-				style={globals(color, highlight).modalHeader}
-				testID='initial-modal-header'
-			>
-				{t('getStarted')}
-			</Text>
-			<Text style={globals(color, highlight).modalTxt}>
-				{t('startHint')}
-			</Text>
-			<Button txt={t('addEnutsMint')} onPress={onConfirm} />
-			<TxtButton
-				txt={t('addMintUrl')}
-				onPress={onCancel}
-				style={[{ paddingTop: 25, paddingBottom: 10, }]}
-			/>
-		</MyModal>
-	)
-}
\ No newline at end of file
diff --git a/src/components/Toaster.tsx b/src/components/Toaster.tsx
index 31ee9c63..bc3c86b6 100644
--- a/src/components/Toaster.tsx
+++ b/src/components/Toaster.tsx
@@ -23,6 +23,7 @@ export default function Toaster() {
 			<TouchableOpacity
 				onPress={closePrompt}
 				style={styles.txtWrap}
+				testID={`${prompt.success ? 'success' : 'error'}-toaster`}
 			>
 				<Txt txt={prompt.msg} styles={[styles.txt]} />
 			</TouchableOpacity>
diff --git a/src/components/TxtInput.tsx b/src/components/TxtInput.tsx
index 5d18ba82..f90fddb7 100644
--- a/src/components/TxtInput.tsx
+++ b/src/components/TxtInput.tsx
@@ -59,6 +59,7 @@ export default function TxtInput({
 			multiline={multiline}
 			numberOfLines={numberOfLines}
 			style={[globals(color).input, { marginBottom: vs(20) }, style]}
+			testID={`${placeholder}-input`}
 		/>
 	)
 }
\ No newline at end of file
diff --git a/test/e2e/1-flow.test.ts b/test/e2e/1-flow.test.ts
index 5ec68538..8e07f08f 100644
--- a/test/e2e/1-flow.test.ts
+++ b/test/e2e/1-flow.test.ts
@@ -9,11 +9,13 @@ import { expect } from 'detox'
  * 4. Add the first default mint
  */
 
-describe('Add the default mint', () => {
+describe('Add the testnut mint', () => {
 	beforeAll(async () => {
 		await device.launchApp()
 	})
 
+	const testmint = 'testnut.cashu.space'
+
 	it('should go through the 3 onboarding screens', async () => {
 		const header1 = element(by.text('eNuts & Ecash'))
 		const header2 = element(by.text('Cashu & Mints'))
@@ -39,21 +41,42 @@ describe('Add the default mint', () => {
 	})
 
 	it('should skip PIN setup', async () => {
-		const skipBtn = element(by.id('Skip-pin-button'))
+		const skipBtn = element(by.id('Skip-button'))
 		await expect(skipBtn).toBeVisible()
 		await skipBtn.tap()
 	})
 
-	it('should add the first default mint', async () => {
+	it('should navigate to mint screen and press "Add a new mint"', async () => {
 		const header1 = element(by.text('No transactions yet'))
 		await expect(header1).toBeVisible()
 		const addMintBtn = element(by.id('Mint-btn'))
 		await expect(addMintBtn).toBeVisible()
 		await addMintBtn.tap()
-		const initialModalHeader = element(by.id('initial-modal-header'))
-		await expect(initialModalHeader).toBeVisible()
-		const addMintUrlBtn = element(by.id('Use the eNuts mint-modal-button'))
-		await addMintUrlBtn.tap()
+		const addNewMintBtn = element(by.id('Add a new mint-button'))
+		await expect(addNewMintBtn).toBeVisible()
+		await addNewMintBtn.tap()
+	})
+
+	it('BAD CASE: open the text input and type an invalid mint url', async () => {
+		const input = element(by.id('Mint URL-input'))
+		const submitBtn = element(by.id('Add mint-modal-button'))
+		await expect(input).toBeVisible()
+		await expect(submitBtn).toBeVisible()
+		await input.typeText('invalid-mint-url')
+		await submitBtn.tap()
+		const errorToaster = element(by.id('error-toaster'))
+		await expect(errorToaster).toBeVisible()
+		await errorToaster.tap()
+		await input.clearText()
+	})
+
+	it('should type the valid testnut url and submit', async () => {
+		const input = element(by.id('Mint URL-input'))
+		const submitBtn = element(by.id('Add mint-modal-button'))
+		await expect(input).toBeVisible()
+		await expect(submitBtn).toBeVisible()
+		await input.typeText(testmint)
+		await submitBtn.tap()
 		const successModalHeader = element(by.id('new-mint-success'))
 		await expect(successModalHeader).toBeVisible()
 	})