diff --git "a/artifacts/android.debug.2024-04-20 22-29-42Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png" "b/artifacts/android.debug.2024-04-20 22-29-42Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png"
new file mode 100644
index 00000000..023a74ae
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 22-29-42Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 22-29-42Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png" "b/artifacts/android.debug.2024-04-20 22-29-42Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png"
new file mode 100644
index 00000000..023a74ae
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 22-29-42Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 22-29-42Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png" "b/artifacts/android.debug.2024-04-20 22-29-42Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png"
new file mode 100644
index 00000000..273647f6
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 22-29-42Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 22-31-18Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png" "b/artifacts/android.debug.2024-04-20 22-31-18Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png"
new file mode 100644
index 00000000..023a74ae
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 22-31-18Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 22-31-18Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png" "b/artifacts/android.debug.2024-04-20 22-31-18Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png"
new file mode 100644
index 00000000..023a74ae
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 22-31-18Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 22-31-18Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png" "b/artifacts/android.debug.2024-04-20 22-31-18Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png"
new file mode 100644
index 00000000..d36f3731
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 22-31-18Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 22-33-15Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png" "b/artifacts/android.debug.2024-04-20 22-33-15Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png"
new file mode 100644
index 00000000..023a74ae
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 22-33-15Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 22-33-15Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png" "b/artifacts/android.debug.2024-04-20 22-33-15Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png"
new file mode 100644
index 00000000..023a74ae
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 22-33-15Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 22-33-15Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png" "b/artifacts/android.debug.2024-04-20 22-33-15Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png"
new file mode 100644
index 00000000..8379d801
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 22-33-15Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 22-35-26Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png" "b/artifacts/android.debug.2024-04-20 22-35-26Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png"
new file mode 100644
index 00000000..023a74ae
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 22-35-26Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 22-35-26Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png" "b/artifacts/android.debug.2024-04-20 22-35-26Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png"
new file mode 100644
index 00000000..023a74ae
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 22-35-26Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 22-35-26Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png" "b/artifacts/android.debug.2024-04-20 22-35-26Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png"
new file mode 100644
index 00000000..4a89025a
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 22-35-26Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 22-37-11Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png" "b/artifacts/android.debug.2024-04-20 22-37-11Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png"
new file mode 100644
index 00000000..023a74ae
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 22-37-11Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 22-37-11Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png" "b/artifacts/android.debug.2024-04-20 22-37-11Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png"
new file mode 100644
index 00000000..023a74ae
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 22-37-11Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 22-37-11Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png" "b/artifacts/android.debug.2024-04-20 22-37-11Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png"
new file mode 100644
index 00000000..83e0d2f3
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 22-37-11Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 22-40-51Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png" "b/artifacts/android.debug.2024-04-20 22-40-51Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png"
new file mode 100644
index 00000000..78fa3a0d
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 22-40-51Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 22-40-51Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png" "b/artifacts/android.debug.2024-04-20 22-40-51Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png"
new file mode 100644
index 00000000..9887368f
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 22-40-51Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 22-40-51Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png" "b/artifacts/android.debug.2024-04-20 22-40-51Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png"
new file mode 100644
index 00000000..f31c9fbb
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 22-40-51Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 22-42-03Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png" "b/artifacts/android.debug.2024-04-20 22-42-03Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png"
new file mode 100644
index 00000000..23a2dda7
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 22-42-03Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 22-42-03Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png" "b/artifacts/android.debug.2024-04-20 22-42-03Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png"
new file mode 100644
index 00000000..23a2dda7
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 22-42-03Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 22-42-03Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png" "b/artifacts/android.debug.2024-04-20 22-42-03Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png"
new file mode 100644
index 00000000..bc89cae1
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 22-42-03Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 22-46-18Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png" "b/artifacts/android.debug.2024-04-20 22-46-18Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png"
new file mode 100644
index 00000000..a930b721
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 22-46-18Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 22-46-18Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png" "b/artifacts/android.debug.2024-04-20 22-46-18Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png"
new file mode 100644
index 00000000..a930b721
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 22-46-18Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 22-46-18Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png" "b/artifacts/android.debug.2024-04-20 22-46-18Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png"
new file mode 100644
index 00000000..ecfc42ff
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 22-46-18Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 22-51-33Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png" "b/artifacts/android.debug.2024-04-20 22-51-33Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png"
new file mode 100644
index 00000000..c3379104
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 22-51-33Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 22-51-33Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png" "b/artifacts/android.debug.2024-04-20 22-51-33Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png"
new file mode 100644
index 00000000..c3379104
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 22-51-33Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 22-51-33Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png" "b/artifacts/android.debug.2024-04-20 22-51-33Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png"
new file mode 100644
index 00000000..b4c4eede
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 22-51-33Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 22-53-56Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png" "b/artifacts/android.debug.2024-04-20 22-53-56Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png"
new file mode 100644
index 00000000..a8f895b2
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 22-53-56Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 22-53-56Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png" "b/artifacts/android.debug.2024-04-20 22-53-56Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png"
new file mode 100644
index 00000000..08fbd89b
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 22-53-56Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 22-53-56Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png" "b/artifacts/android.debug.2024-04-20 22-53-56Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png"
new file mode 100644
index 00000000..4ae4ffce
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 22-53-56Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 23-00-18Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png" "b/artifacts/android.debug.2024-04-20 23-00-18Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png"
new file mode 100644
index 00000000..c9177825
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 23-00-18Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 23-00-18Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png" "b/artifacts/android.debug.2024-04-20 23-00-18Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png"
new file mode 100644
index 00000000..c9177825
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 23-00-18Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 23-00-18Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png" "b/artifacts/android.debug.2024-04-20 23-00-18Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png"
new file mode 100644
index 00000000..41394540
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 23-00-18Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 23-01-48Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png" "b/artifacts/android.debug.2024-04-20 23-01-48Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png"
new file mode 100644
index 00000000..1629cd36
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 23-01-48Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 23-01-48Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png" "b/artifacts/android.debug.2024-04-20 23-01-48Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png"
new file mode 100644
index 00000000..44d6939d
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 23-01-48Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 23-01-48Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png" "b/artifacts/android.debug.2024-04-20 23-01-48Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png"
new file mode 100644
index 00000000..5d1c8dcd
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 23-01-48Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 23-04-02Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png" "b/artifacts/android.debug.2024-04-20 23-04-02Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png"
new file mode 100644
index 00000000..d58430db
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 23-04-02Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 23-04-02Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png" "b/artifacts/android.debug.2024-04-20 23-04-02Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png"
new file mode 100644
index 00000000..d58430db
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 23-04-02Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 23-04-02Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png" "b/artifacts/android.debug.2024-04-20 23-04-02Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png"
new file mode 100644
index 00000000..d68cad70
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 23-04-02Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 23-06-35Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png" "b/artifacts/android.debug.2024-04-20 23-06-35Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png"
new file mode 100644
index 00000000..23a2dda7
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 23-06-35Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testDone.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 23-06-35Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png" "b/artifacts/android.debug.2024-04-20 23-06-35Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png"
new file mode 100644
index 00000000..23a2dda7
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 23-06-35Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testFnFailure.png" differ
diff --git "a/artifacts/android.debug.2024-04-20 23-06-35Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png" "b/artifacts/android.debug.2024-04-20 23-06-35Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png"
new file mode 100644
index 00000000..bf561fab
Binary files /dev/null and "b/artifacts/android.debug.2024-04-20 23-06-35Z/\342\234\227 Login Screen Tests should fill email and password inputs and click the register button/testStart.png" differ
diff --git a/components/EmailInput.js b/components/EmailInput.js
index 5dc203e0..2cea89e4 100644
--- a/components/EmailInput.js
+++ b/components/EmailInput.js
@@ -2,10 +2,11 @@ import React from 'react';
 import { TextInput, View } from 'react-native';
 import styles from '../styles/LoginBoxesStyle';
 
-const Email = ({ value, onChangeText }) => {
+const Email = ({ value, onChangeText, testID }) => {
   return (
     <View style={styles.container}>
       <TextInput
+        testID={testID}
         style={styles.emailInput}
         placeholder="Email"
         value={value}
diff --git a/components/LoginButton.js b/components/LoginButton.js
index beeca53b..61d03d28 100644
--- a/components/LoginButton.js
+++ b/components/LoginButton.js
@@ -3,9 +3,9 @@ import { TouchableOpacity, Text } from 'react-native';
 import { FontAwesome5 } from '@expo/vector-icons'; 
 import styles from '../styles/LoginButtonStyle';
 
-const LoginButton = ({ onPress }) => {
+const LoginButton = ({ onPress, testID }) => {
   return (
-    <TouchableOpacity onPress={onPress}>
+    <TouchableOpacity onPress={onPress} testID={testID}>
       <FontAwesome5 name="arrow-circle-right" size={45} color="#57BCBE" />
     </TouchableOpacity>
   );
diff --git a/components/PasswordInput.js b/components/PasswordInput.js
index dea13872..9140adf8 100644
--- a/components/PasswordInput.js
+++ b/components/PasswordInput.js
@@ -2,10 +2,11 @@ import React from 'react';
 import { TextInput, View } from 'react-native';
 import styles from '../styles/LoginBoxesStyle';
 
-const PasswordInput = ({ value, onChangeText }) => {
+const PasswordInput = ({ value, onChangeText, testID }) => {
   return (
     <View style={styles.container}>
       <TextInput
+        testID={testID}
         style={styles.passwordInput}
         placeholder="Password"
         value={value}
diff --git a/e2e/jest.config.js b/e2e/jest.config.js
index d4a16264..1f9ef123 100644
--- a/e2e/jest.config.js
+++ b/e2e/jest.config.js
@@ -1,12 +1,12 @@
 /** @type {import('@jest/types').Config.InitialOptions} */
 module.exports = {
-  rootDir: '..',
-  testMatch: ['<rootDir>/e2e/**/*.test.js'],
-  testTimeout: 120000,
-  maxWorkers: 1,
-  globalSetup: 'detox/runners/jest/globalSetup',
-  globalTeardown: 'detox/runners/jest/globalTeardown',
-  reporters: ['detox/runners/jest/reporter'],
-  testEnvironment: 'detox/runners/jest/testEnvironment',
-  verbose: true,
+	rootDir: "..",
+	testMatch: ["<rootDir>/e2e/**/*.test.js"],
+	testTimeout: 120000,
+	maxWorkers: 1,
+	globalSetup: "detox/runners/jest/globalSetup",
+	globalTeardown: "detox/runners/jest/globalTeardown",
+	reporters: ["detox/runners/jest/reporter"],
+	testEnvironment: "detox/runners/jest/testEnvironment",
+	verbose: true,
 };
\ No newline at end of file
diff --git a/e2e/loginScreen.test.js b/e2e/loginScreen.test.js
index 8c44596a..6b279694 100644
--- a/e2e/loginScreen.test.js
+++ b/e2e/loginScreen.test.js
@@ -1,17 +1,26 @@
-describe("Login Screen", () => {
+describe('Login Screen Tests', () => {
     beforeEach(async () => {
-        await device.launchApp();
+        await device.launchApp({newInstance: true});
     });
 
-    it("Expect to see login button", async () => {
-        await waitFor(element(by.id('login-submit-button'))).toBeVisible().withTimeout(5000);
-    });
+    it('should fill email and password inputs and click the register button', async () => {
+        await waitFor(element(by.id('register-button')))
+            .toBeVisible()
+            .withTimeout(5000);
+        console.log('Login username input should now be visible');
+        await element(by.id('login-username-input')).typeText('dp8@email.sc.edu');
+
+        await element(by.id('login-password-input')).typeText('CWA843');
+
+        //await device.disableSynchronization();
+        console.log('Tapping login button now...');
+        await element(by.id('login-submit-button')).tap();
+        console.log('Button tapped, proceeding without waiting for network...');
+
+        await waitFor(element(by.text('Login Successful'))).toBeVisible().withTimeout(15000);
+
+        //await device.enableSynchronization();
 
-    it("Should login", async () =>  {
-      await waitFor(element(by.id('login-submit-button'))).toBeVisible().withTimeout(5000);
-      await element(by.id('login-username-input')).typeText('dp8@email.sc.edu');
-      await element(by.id('login-password-input')).typeText('CWA843');
-      await element(by.id('login-submit-button')).tap();
-      await waitFor(element(by.id('settings-button'))).toBeVisible().withTimeout(5000);
+        await element(by.text("OK")).tap();
     });
 });
diff --git a/e2e/registerScreen.test.js b/e2e/registerScreen.test.js
new file mode 100644
index 00000000..07cac74b
--- /dev/null
+++ b/e2e/registerScreen.test.js
@@ -0,0 +1,14 @@
+describe('Login Screen Tests', () => {
+    beforeEach(async () => {
+        await device.launchApp({newInstance: true});
+    });
+
+    it('should click register button and show register screen', async () => {
+        await waitFor(element(by.id('register-button')))
+            .toBeVisible()
+            .withTimeout(5000);
+        await element(by.id('register-button')).tap();
+
+        await expect(element(by.id('register-screen-id'))).toBeVisible();
+    });
+});
diff --git a/screens/LoginScreen.js b/screens/LoginScreen.js
index bd8db218..b84ba3dd 100644
--- a/screens/LoginScreen.js
+++ b/screens/LoginScreen.js
@@ -116,22 +116,22 @@ const LoginScreen = ({ navigation }) => {
         </View>
         <View style={styles.inputContainer}>
           <View style={styles.passwordBox}>
-            <PasswordInput value={password} onChangeText={setPassword} testID="login-password-input"/>
+            <PasswordInput value={password} onChangeText={setPassword} testID='login-password-input'/>
           </View>
           <View style={styles.emailBox}>
             <EmailInput
               style={styles.emailBox}
               value={email}
               onChangeText={setEmail}
-              testID="login-username-input"
+              testID='login-username-input'
             />
           </View>
           <View style={styles.buttonBox}>
-            <LoginButton onPress={handleLogin} testID="login-submit-button"/>
+            <LoginButton onPress={handleLogin} testID='login-submit-button'/>
           </View>
         </View>
         <View style={styles.textContainer}>
-          <TouchableOpacity onPress={() => navigation.navigate("Register")}>
+          <TouchableOpacity onPress={() => navigation.navigate("Register")} testID="register-button">
             <Text style={styles.registerText}>
               Don't have an account? Register
             </Text>