diff --git a/app/src/androidTest/java/ch/sdp/vibester/UtilTest.kt b/app/src/androidTest/java/ch/sdp/vibester/UtilTest.kt
deleted file mode 100644
index f081c9a67..000000000
--- a/app/src/androidTest/java/ch/sdp/vibester/UtilTest.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package ch.sdp.vibester
-
-import ch.sdp.vibester.util.Util
-import org.junit.Test
-
-import org.junit.Assert.*
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class UtilTest {
-    @Test
-    fun newIdIsCorrectLength() {
-        assertEquals(Util.createNewId().length, 10)
-    }
-}
\ No newline at end of file
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/AuthenticationActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/AuthenticationActivityTest.kt
index 2336bc2d8..b9d4f7c6e 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/AuthenticationActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/AuthenticationActivityTest.kt
@@ -14,6 +14,7 @@ import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import ch.sdp.vibester.R
+import ch.sdp.vibester.TestMode
 import ch.sdp.vibester.auth.FireBaseAuthenticator
 import com.google.android.gms.tasks.OnCompleteListener
 import com.google.android.gms.tasks.Task
@@ -131,6 +132,13 @@ class AuthenticationActivityTest {
         onView(withId(R.id.email)).check(matches(withText("Empty email or password")))
     }
 
+    @Test
+    fun returnToMain() {
+        onView(withId(R.id.authentication_returnToMain)).perform(click())
+        Intents.intended(IntentMatchers.hasComponent(WelcomeActivity::class.java.name))
+    }
+
+
     @Test
     fun stringValidationWrongEmail() {
         val username = "john"
@@ -179,6 +187,8 @@ class AuthenticationActivityTest {
         val username = "user@user.com"
         val password = "password"
 
+        TestMode.setTest()
+
         val mockTask = createMockTask(true)
         val mockUser = createMockUser(username)
         every { mockAuthenticator.createAccount(username, password) } returns mockTask
@@ -187,7 +197,6 @@ class AuthenticationActivityTest {
         onView(withId(R.id.username)).perform(ViewActions.typeText(username), closeSoftKeyboard())
         onView(withId(R.id.password)).perform(ViewActions.typeText(password), closeSoftKeyboard())
         onView(withId(R.id.createAcc)).perform(click())
-
         Intents.intended(IntentMatchers.hasComponent(CreateProfileActivity::class.java.name))
         Intents.intended(IntentMatchers.hasExtra("email", username))
 
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/BuzzerScreenActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/BuzzerScreenActivityTest.kt
index b82cfe2a6..be87a7a8c 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/BuzzerScreenActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/BuzzerScreenActivityTest.kt
@@ -14,6 +14,7 @@ import androidx.test.espresso.matcher.ViewMatchers.*
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
+import ch.sdp.vibester.TestMode
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/BuzzerSetupActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/BuzzerSetupActivityTest.kt
index c0a64452c..bc0102996 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/BuzzerSetupActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/BuzzerSetupActivityTest.kt
@@ -1,8 +1,5 @@
 package ch.sdp.vibester.activity
-import android.content.Context
 import android.content.Intent
-import android.widget.FrameLayout
-import android.widget.LinearLayout
 import androidx.test.core.app.ActivityScenario
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onData
@@ -22,7 +19,6 @@ import ch.sdp.vibester.R
 import org.hamcrest.Matchers
 import org.junit.After
 import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/CreateProfileActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/CreateProfileActivityTest.kt
index 2b130eef2..eadeffe9b 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/CreateProfileActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/CreateProfileActivityTest.kt
@@ -4,13 +4,14 @@ import android.content.Intent
 import androidx.test.core.app.ActivityScenario
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.action.ViewActions.*
 import androidx.test.espresso.intent.Intents
 import androidx.test.espresso.intent.matcher.IntentMatchers
-import androidx.test.espresso.matcher.ViewMatchers.* //change this import
+import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
-import ch.sdp.vibester.database.UsersRepo
+import ch.sdp.vibester.TestMode
+import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.user.User
 import dagger.hilt.android.testing.BindValue
 import dagger.hilt.android.testing.HiltAndroidRule
@@ -38,16 +39,17 @@ class CreateProfileActivityTest {
     }
 
     @BindValue @JvmField
-    val mockUsersRepo = mockk<UsersRepo>()
+    val mockUsersRepo = mockk<DataGetter>()
 
     private fun createMockInvocation(email: String) {
-        every {mockUsersRepo.createUser(any(), any(), any())} answers {
+        every {mockUsersRepo.createUser(any(), any(), any(), any())} answers {
             lastArg<(String) -> Unit>().invoke(email)
         }
 
-        every { mockUsersRepo.getUserData(any(), any()) } answers {
+        every { mockUsersRepo.getUserData(any()) } answers {
             secondArg<(User) -> Unit>().invoke(User())
         }
+
     }
 
     @After
@@ -57,24 +59,27 @@ class CreateProfileActivityTest {
 
     @Test
     fun createAccCorrect() {
+        TestMode.setTest()
         var username = "mockUsername"
         var mockEmail = "mockEmail@test.com"
 
         val intent = Intent(ApplicationProvider.getApplicationContext(), CreateProfileActivity::class.java)
         intent.putExtra("email", mockEmail)
+        intent.putExtra("isUnitTest", true)
 
         createMockInvocation(mockEmail)
 
         val scn: ActivityScenario<CreateProfileActivity> = ActivityScenario.launch(intent)
 
-        onView(withId(R.id.accountUsername)).perform(ViewActions.typeText(username),
-            ViewActions.closeSoftKeyboard()
+        onView(withId(R.id.accountUsername)).perform(typeText(username),
+            closeSoftKeyboard()
         )
 
-        onView(withId(R.id.createButton)).perform(ViewActions.click())
+       onView(withId(R.id.createButton)).perform(click())
 
-        Intents.intended(IntentMatchers.hasComponent(ProfileActivity::class.java.name))
-        Intents.intended(IntentMatchers.hasExtra("email", mockEmail))
+       Intents.intended(IntentMatchers.hasComponent(ProfileActivity::class.java.name))
+       Intents.intended(IntentMatchers.hasExtra("email", mockEmail))
+       Intents.intended(IntentMatchers.hasExtra("isUnitTest", true))
     }
 
 }
\ No newline at end of file
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/DownloadActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/DownloadActivityTest.kt
index ff30d3b5b..dd7688044 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/DownloadActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/DownloadActivityTest.kt
@@ -1,22 +1,10 @@
 package ch.sdp.vibester.activity
 
-import android.content.Intent
-import android.view.View
-import androidx.test.core.app.ActivityScenario
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.action.ViewActions.*
-import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.intent.Intents
-import androidx.test.espresso.matcher.ViewMatchers.*
 import androidx.test.ext.junit.rules.ActivityScenarioRule
-import ch.sdp.vibester.R
 import org.junit.After
-import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Rule
-import org.junit.Test
-import java.io.File
 
 class DownloadActivityTest {
 
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/GameEndingActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/GameEndingActivityTest.kt
index bd33fe975..6de9594fa 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/GameEndingActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/GameEndingActivityTest.kt
@@ -14,6 +14,7 @@ import androidx.test.espresso.matcher.ViewMatchers.*
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
+import ch.sdp.vibester.TestMode
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
@@ -23,8 +24,7 @@ import org.junit.runner.RunWith
 @RunWith(AndroidJUnit4::class)
 class GameEndingActivityTest {
 
-    @Rule
-    @JvmField
+    @get:Rule
     val activityRule = ActivityScenarioRule(GameEndingActivity::class.java)
 
     @Before
@@ -71,6 +71,7 @@ class GameEndingActivityTest {
             Intent(ApplicationProvider.getApplicationContext(), GameEndingActivity::class.java)
         intent.putExtra("playerName", name)
         intent.putExtra("nbIncorrectSong", nbInc)
+        intent.putExtra("Winner Name", "Testing the Placeholder")
 
         intent.putStringArrayListExtra("str_arr_inc", incArray)
         intent.putStringArrayListExtra("str_arr_name", statNames)
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/GameSetupActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/GameSetupActivityTest.kt
index 2e44abb86..850b0c381 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/GameSetupActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/GameSetupActivityTest.kt
@@ -8,6 +8,7 @@ import androidx.test.espresso.action.ViewActions.scrollTo
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.intent.Intents
 import androidx.test.espresso.intent.Intents.intended
+import androidx.test.espresso.intent.matcher.IntentMatchers
 import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent
 import androidx.test.espresso.intent.matcher.IntentMatchers.hasExtra
 import androidx.test.espresso.matcher.ViewMatchers.withId
@@ -52,6 +53,16 @@ class GameSetupActivityTest {
         onView(withId(R.id.difficulty_spinner)).check(matches(withSpinnerText("Easy")))
     }
 
+    @Test
+    fun checkReturnButton() {
+        onView(withId(R.id.local_buzzer_game_button)).perform(scrollTo(), click())
+        onView(withId(R.id.btsButton)).perform(click())
+        onView(withId(R.id.gameSetup_returnToMain)).perform(click())
+        onView(withId(R.id.gameSetup_returnToMain)).perform(click())
+        onView(withId(R.id.gameSetup_returnToMain)).perform(click())
+        Intents.intended(IntentMatchers.hasComponent(WelcomeActivity::class.java.name))
+    }
+
     @Test
     fun checkCustomSelectMedium() {
         onView(withId(R.id.local_buzzer_game_button)).perform(scrollTo(), click())
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt
index 045e291c3..d09ca1306 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt
@@ -17,12 +17,16 @@ import ch.sdp.vibester.R
 import ch.sdp.vibester.api.LastfmMethod
 import ch.sdp.vibester.helper.TypingGameManager
 import org.hamcrest.CoreMatchers.not
-import org.junit.*
+import org.junit.After
 import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 class LyricsBelongGameActivityTest {
+
     private val sleepTime: Long = 5000
     private val songName = "Thunder"
     private val artistName = "Imagine Dragons"
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
index 307314158..e7a6d8c7c 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
@@ -10,11 +10,12 @@ import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.intent.Intents
 import androidx.test.espresso.intent.matcher.IntentMatchers
-import androidx.test.espresso.matcher.ViewMatchers.* //change this import
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
-import ch.sdp.vibester.database.UsersRepo
-import ch.sdp.vibester.model.UserSharedPref
+import ch.sdp.vibester.TestMode
+import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.user.User
 import dagger.hilt.android.testing.BindValue
 import dagger.hilt.android.testing.HiltAndroidRule
@@ -42,13 +43,15 @@ class ProfileActivityTest {
     }
 
     @BindValue @JvmField
-    val mockUsersRepo = mockk<UsersRepo>()
+    val mockUsersRepo = mockk<DataGetter>()
 
-    private fun createMockInvocation(mockUser: User) {
-        every { mockUsersRepo.getUserData(any(), any()) } answers {
-            secondArg<(User) -> Unit>().invoke(mockUser)
+    private fun createMockInvocation(mockProfile: User) {
+        every { mockUsersRepo.getUserData(any()) } answers {
+            secondArg<(User) -> Unit>().invoke(mockProfile)
         }
         every { mockUsersRepo.updateFieldString(any(), any(), any()) } answers {}
+
+        every { mockUsersRepo.getUserData(any())} answers {}
     }
 
     @After
@@ -61,9 +64,10 @@ class ProfileActivityTest {
         val inputProfile = User("Lalisa Bon","bit.ly/3IUnyAF", "lisa@test.com",  12, 8, 29, 0)
         val ctx = ApplicationProvider.getApplicationContext() as Context
         val intent = Intent(ctx, ProfileActivity::class.java)
+        intent.putExtra("isUnitTest", true)
+        intent.putExtra("userTestProfile",  inputProfile)
 
         createMockInvocation(inputProfile)
-        UserSharedPref.setUser(ctx, inputProfile, false)
         val scn: ActivityScenario<ProfileActivity> = ActivityScenario.launch(intent)
 
         onView(withId(R.id.username)).check(matches(withText(inputProfile.username)))
@@ -76,6 +80,8 @@ class ProfileActivityTest {
     fun clickBackToMain(){
         val ctx = ApplicationProvider.getApplicationContext() as Context
         val intent = Intent(ctx, ProfileActivity::class.java)
+        intent.putExtra("isUnitTest", true)
+
         val scn: ActivityScenario<ProfileActivity> = ActivityScenario.launch(intent)
 
         onView(withId(R.id.profile_returnToMain)).perform(click())
@@ -88,8 +94,9 @@ class ProfileActivityTest {
         val inputProfile = User("Lalisa Bon","bit.ly/3IUnyAF", "lisa@test.com",  12, 8, 29, 0)
         val ctx = ApplicationProvider.getApplicationContext() as Context
         val intent = Intent(ctx, ProfileActivity::class.java)
+        intent.putExtra("isUnitTest", true)
+        intent.putExtra("userTestProfile", inputProfile)
 
-        UserSharedPref.setUser(ctx, inputProfile, false)
         createMockInvocation(inputProfile)
 
         val scn: ActivityScenario<ProfileActivity> = ActivityScenario.launch(intent)
@@ -110,8 +117,9 @@ class ProfileActivityTest {
         val inputProfile = User( "Lalisa Bon","bit.ly/3IUnyAF", "lisa@test.com",  12, 8, 29, 0)
         val ctx = ApplicationProvider.getApplicationContext() as Context
         val intent = Intent(ctx, ProfileActivity::class.java)
+        intent.putExtra("isUnitTest", true)
+        intent.putExtra("userTestProfile", inputProfile)
 
-        UserSharedPref.setUser(ctx, inputProfile, false)
         createMockInvocation(inputProfile)
 
         val scn: ActivityScenario<ProfileActivity> = ActivityScenario.launch(intent)
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/ScoreBoardActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/ScoreBoardActivityTest.kt
index 8549856f1..30fe70ac0 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/ScoreBoardActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/ScoreBoardActivityTest.kt
@@ -6,7 +6,8 @@ import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.contrib.RecyclerViewActions
-import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt
index e64c99df5..3065522af 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt
@@ -13,10 +13,12 @@ import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.intent.Intents
 import androidx.test.espresso.intent.matcher.IntentMatchers
-import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
+import ch.sdp.vibester.TestMode
 import ch.sdp.vibester.api.LastfmMethod
 import ch.sdp.vibester.helper.TypingGameManager
 import ch.sdp.vibester.model.Song
@@ -30,6 +32,20 @@ import org.junit.runner.RunWith
 @RunWith(AndroidJUnit4::class)
 class TypingGameActivityTest {
 
+    @JvmField
+    @get:Rule
+    val activityRule = ActivityScenarioRule(TypingGameActivity::class.java)
+
+    @Before
+    fun setUp() {
+        Intents.init()
+    }
+
+    @After
+    fun clean() {
+        Intents.release()
+    }
+
     private val expectedSize = 200
     private fun setGameManager(numSongs:Int = 1, valid: Boolean = true): TypingGameManager {
         val epilogue = "{\"tracks\":{\"track\":["
@@ -50,21 +66,6 @@ class TypingGameActivityTest {
         return gameManager
     }
 
-    @Rule
-    @JvmField
-    val activityRule = ActivityScenarioRule(TypingGameActivity::class.java)
-
-    @Before
-    fun setUp() {
-        Intents.init()
-    }
-
-    @After
-    fun clean() {
-        Intents.release()
-    }
-
-
     @Test
     fun spaceGenTest() {
         val height = 10
@@ -109,6 +110,7 @@ class TypingGameActivityTest {
 
     @Test
     fun guessLayoutTest() {
+        TestMode.setTest()
         val inputTxt = """
             {
                 "resultCount":1,
@@ -199,7 +201,7 @@ class TypingGameActivityTest {
     */
     @Test
     fun checkIntentOnEnding() {
-
+        TestMode.setTest()
         val inputTxt = """
             {
                 "resultCount":1,
@@ -274,6 +276,7 @@ class TypingGameActivityTest {
 
     @Test
     fun nextButtonOnClick(){
+        TestMode.setTest()
         val gameManager = setGameManager(2)
         assertEquals(gameManager.getSongList().size, 2)
 
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt
index 154f11527..b642ebf55 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt
@@ -9,6 +9,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
+import ch.sdp.vibester.TestMode
 import com.google.firebase.auth.FirebaseAuth
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
@@ -71,7 +72,13 @@ class WelcomeActivityTest {
 
     @Test
     fun checkIntentOnSearch() {
+        TestMode.setTest()
         onView(withId(R.id.welcome_search)).perform(click())
         intended(hasComponent(SearchUserActivity::class.java.name))
     }
+
+    @Test
+    fun checkIntentOnSearchWithoutTestMode() {
+        onView(withId(R.id.welcome_search)).perform(click())
+    }
 }
\ No newline at end of file
diff --git a/app/src/androidTest/java/ch/sdp/vibester/auth/FireBaseAuthenticatorTest.kt b/app/src/androidTest/java/ch/sdp/vibester/auth/FireBaseAuthenticatorTest.kt
new file mode 100644
index 000000000..51f44bdc5
--- /dev/null
+++ b/app/src/androidTest/java/ch/sdp/vibester/auth/FireBaseAuthenticatorTest.kt
@@ -0,0 +1,32 @@
+package ch.sdp.vibester.auth
+
+import androidx.test.core.app.ApplicationProvider
+import ch.sdp.vibester.TestMode
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertThrows
+import org.junit.Test
+
+class FireBaseAuthenticatorTest {
+
+    @Test
+    fun checkTestModeGetMail(){
+        TestMode.setTest()
+        assertEquals("", FireBaseAuthenticator.getCurrentUserMail())
+    }
+
+    @Test
+    fun checkTestModeGetUID(){
+        TestMode.setTest()
+        assertEquals("", FireBaseAuthenticator.getCurrentUID())
+    }
+
+    @Test
+    fun checkGoogleFakeRequestCode(){
+        assertEquals("Authentication error", FireBaseAuthenticator.googleActivityResult(0, 0, null, ApplicationProvider.getApplicationContext()))
+    }
+
+    @Test
+    fun checkGoogleFakeGoodCode(){
+        assertEquals("Authentication error", FireBaseAuthenticator.googleActivityResult(1000, 0, null, ApplicationProvider.getApplicationContext()))
+    }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/ch/sdp/vibester/model/UserSharedPrefTest.kt b/app/src/androidTest/java/ch/sdp/vibester/model/UserSharedPrefTest.kt
deleted file mode 100644
index 63349a2ed..000000000
--- a/app/src/androidTest/java/ch/sdp/vibester/model/UserSharedPrefTest.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-package ch.sdp.vibester.model
-
-import android.content.Context
-import androidx.test.core.app.ApplicationProvider
-import ch.sdp.vibester.user.User
-import org.junit.Assert.assertEquals
-import org.junit.Test
-
-class UserSharedPrefTest {
-    @Test
-    fun sharedPrefTest(){
-        val ctx = ApplicationProvider.getApplicationContext() as Context
-
-        val mailTest = "lisa@test.com"
-        UserSharedPref.userReset(ctx, mailTest)
-        UserSharedPref.updateUsername(ctx, "Lalisa Bon")
-        UserSharedPref.updateScore(ctx)
-        Thread.sleep(1000)
-//        assertEquals(mailTest, UserSharedPref.getUser(ctx).email) //TODO temporary disable does not pass on CI
-    }
-
-    @Test
-    fun sharedPrefTest2(){
-        val ctx = ApplicationProvider.getApplicationContext() as Context
-        val username: String = "myUsername"
-        val image: String = "myImage"
-        val email: String = "myEmail"
-        val totalGames: Int = 10
-        val bestScore: Int = 27
-        val correctSongs: Int = 16
-        val ranking: Int = 6
-
-        val pro = User(username, image, email, totalGames, bestScore, correctSongs, ranking)
-        UserSharedPref.setUser(ctx, pro, false)
-        UserSharedPref.updateScore(ctx, 1, -1, 0, 1)
-        Thread.sleep(1000)
-        val updated = UserSharedPref.getUser(ctx)
-
-        assertEquals(pro.username, updated.username)
-        assertEquals(pro.image, updated.image)
-        assertEquals(pro.email, updated.email)
-        assertEquals(pro.totalGames+1, updated.totalGames)
-        assertEquals(pro.bestScore-1, updated.bestScore)
-        assertEquals(pro.correctSongs, updated.correctSongs)
-        assertEquals(pro.ranking+1, updated.ranking)
-    }
-
-
-}
diff --git a/app/src/main/java/ch/sdp/vibester/TestMode.kt b/app/src/main/java/ch/sdp/vibester/TestMode.kt
new file mode 100644
index 000000000..098889896
--- /dev/null
+++ b/app/src/main/java/ch/sdp/vibester/TestMode.kt
@@ -0,0 +1,26 @@
+package ch.sdp.vibester
+
+
+/**
+ * This class represent a state manager that can be used in unit test
+ * It may be used to disable certain features for unit test
+ */
+class TestMode private constructor(){
+    companion object{
+        private var isTest: Boolean = false
+
+        /**
+         * Setter for IsTest()
+         */
+        fun setTest(){
+            isTest = true
+        }
+
+        /**
+         * Is Test enabled
+         */
+        fun isTest(): Boolean {
+            return isTest
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
index 250374bd0..4355466b0 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
@@ -2,6 +2,7 @@ package ch.sdp.vibester.activity
 
 import android.content.Intent
 import android.os.Bundle
+import android.util.Log
 import android.view.Window
 import android.widget.Button
 import android.widget.EditText
@@ -9,24 +10,40 @@ import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import ch.sdp.vibester.R
+import ch.sdp.vibester.TestMode
 import ch.sdp.vibester.auth.FireBaseAuthenticator
+import ch.sdp.vibester.database.DataGetter
+import ch.sdp.vibester.helper.IntentSwitcher
 import com.google.android.gms.auth.api.signin.GoogleSignIn
 import com.google.android.gms.auth.api.signin.GoogleSignInClient
 import com.google.android.gms.auth.api.signin.GoogleSignInOptions
+import com.google.android.gms.common.api.ApiException
 import com.google.android.gms.tasks.Task
+import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.firebase.auth.AuthResult
+import com.google.firebase.auth.FirebaseAuth
+import com.google.firebase.auth.FirebaseUser
+import com.google.firebase.auth.GoogleAuthProvider
+import com.google.firebase.auth.ktx.auth
+import com.google.firebase.ktx.Firebase
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
 
 @AndroidEntryPoint
 class AuthenticationActivity : AppCompatActivity() {
+    private val AUTHENTICATION_PERMISSION_CODE = 1000
 
     private lateinit var googleSignInClient: GoogleSignInClient
 
+    @Inject
+    lateinit var dataGetter: DataGetter
+
     @Inject
     lateinit var authenticator: FireBaseAuthenticator
 
+    private lateinit var auth: FirebaseAuth
+
     private lateinit var email: TextView
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -35,17 +52,23 @@ class AuthenticationActivity : AppCompatActivity() {
         supportActionBar?.hide()
         setContentView(R.layout.activity_authentication)
 
+        val googleSignInToken = "7687769601-qiqrp6kt48v89ub76k9lkpefh9ls36ha.apps.googleusercontent.com"
+
         val gso = GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
+            .requestIdToken(googleSignInToken)
             .requestEmail()
             .build()
 
         googleSignInClient = GoogleSignIn.getClient(this, gso)
 
+        auth = Firebase.auth
 
         val btCreateAcc = findViewById<Button>(R.id.createAcc)
         val btLogIn = findViewById<Button>(R.id.logIn)
         val googleSignIn = findViewById<Button>(R.id.googleBtn)
 
+        val returnToMain = findViewById<FloatingActionButton>(R.id.authentication_returnToMain)
+
         val username = findViewById<EditText>(R.id.username)
         val password = findViewById<EditText>(R.id.password)
         email = findViewById(R.id.email)
@@ -63,6 +86,11 @@ class AuthenticationActivity : AppCompatActivity() {
         googleSignIn.setOnClickListener {
             signInGoogle()
         }
+
+        returnToMain.setOnClickListener {
+            IntentSwitcher.switchBackToWelcome(this)
+            finish()
+        }
     }
 
     public override fun onStart() {
@@ -70,16 +98,51 @@ class AuthenticationActivity : AppCompatActivity() {
     }
 
     /**
-     * A function to updates the UI based on google sign in result
+     * A function that is called on google sign in result
      * @param requestCode a request code
      * @param resultCode a result code
      * @param data intent returned from google sign in
      */
-    public override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
-        updateUI(authenticator.googleActivityResult(requestCode, resultCode, data), false)
+        if (requestCode == AUTHENTICATION_PERMISSION_CODE) {
+            val task = GoogleSignIn.getSignedInAccountFromIntent(data)
+            try {
+                val account = task.getResult(ApiException::class.java)!!
+                Log.d(getString(R.string.log_tag), "firebaseAuthWithGoogle:" + account.id)
+                googleAuthFirebase(account.idToken!!)
+            } catch (e: ApiException) {
+                Log.d(getString(R.string.log_tag), "Google sign in failed", e)
+                updateUI("Authentication Error", false, null)
+            }
+        }
+    }
+
+
+    private fun googleAuthFirebase(idToken: String) {
+        val credential = GoogleAuthProvider.getCredential(idToken, null)
+        auth.signInWithCredential(credential)
+            .addOnCompleteListener(this) { task ->
+                if (task.isSuccessful) {
+                    // Sign in success, update UI with the signed-in user's information
+                    Log.d(getString(R.string.log_tag), "signInWithCredential:success")
+                    var createAcc: Boolean = false
+                    if (task.getResult().additionalUserInfo != null) {
+                        createAcc = task.getResult().additionalUserInfo!!.isNewUser
+                    }
+                    val user = auth.currentUser
+                    if (user != null) {
+                        updateUI(user.email.toString(), createAcc, user)
+                    }
+                } else {
+                    // fail
+                    Log.d(getString(R.string.log_tag), "signInWithCredential:failure", task.exception)
+                    updateUI("Authentication Error", false, null)
+                }
+            }
     }
 
+
     /**
      * A function validates email and password
      * @param email email
@@ -128,7 +191,7 @@ class AuthenticationActivity : AppCompatActivity() {
      */
     private fun signInGoogle() {
         val intent = googleSignInClient.signInIntent
-        startActivityForResult(intent, 1000)
+        startActivityForResult(intent, AUTHENTICATION_PERMISSION_CODE)
     }
 
     /**
@@ -143,19 +206,29 @@ class AuthenticationActivity : AppCompatActivity() {
             ).show()
             val user = authenticator.getCurrUser()
             if (user != null) {
-                updateUI(user.email, createAcc)
+                updateUI(user.email, createAcc, user)
             }
         } else {
             Toast.makeText(
                 baseContext, "Authentication failed.",
                 Toast.LENGTH_SHORT
             ).show()
-            updateUI("Authentication error", false)
+            updateUI("Authentication error", false, null)
         }
     }
 
-    private fun updateUI(emailText: String?,
-                         createAcc: Boolean,
+
+    private fun startNewActivity(email: String) {
+        val newIntent = Intent(this, CreateProfileActivity::class.java)
+        newIntent.putExtra("email", email)
+        startActivity(newIntent)
+    }
+
+
+    private fun updateUI(
+        emailText: String?,
+        createAcc: Boolean,
+        user: FirebaseUser?
     ) {
         if (emailText != null) {
             if('@' in emailText && !createAcc) {
@@ -164,10 +237,12 @@ class AuthenticationActivity : AppCompatActivity() {
                 startActivity(newIntent)
             }
 
-            else if('@' in emailText && createAcc) {
-                val newIntent = Intent(this, CreateProfileActivity::class.java)
-                newIntent.putExtra("email", emailText)
-                startActivity(newIntent)
+            else if('@' in emailText && createAcc && user != null) { //
+                if (TestMode.isTest()) {
+                    startNewActivity(emailText)
+                }else{
+                    dataGetter.createUser(emailText, user.uid, this::startNewActivity, user.uid)
+                }
             }
 
             else {
diff --git a/app/src/main/java/ch/sdp/vibester/activity/BuzzerScreenActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/BuzzerScreenActivity.kt
index 5161ba1f8..0ab11020c 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/BuzzerScreenActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/BuzzerScreenActivity.kt
@@ -12,8 +12,6 @@ import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import ch.sdp.vibester.BuzzerScoreUpdater
 import ch.sdp.vibester.R
-import kotlin.collections.ArrayList
-import kotlin.collections.HashMap
 
 
 class BuzzerScreenActivity : AppCompatActivity() {
diff --git a/app/src/main/java/ch/sdp/vibester/activity/BuzzerSetupActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/BuzzerSetupActivity.kt
index b32f3a1bb..fe46631b8 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/BuzzerSetupActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/BuzzerSetupActivity.kt
@@ -2,10 +2,10 @@ package ch.sdp.vibester.activity
 
 import android.content.Context
 import android.content.Intent
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.view.View
 import android.widget.*
+import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.children
 import ch.sdp.vibester.R
 
diff --git a/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt
index 6f6365639..2f0ca72cc 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/CreateProfileActivity.kt
@@ -2,15 +2,16 @@ package ch.sdp.vibester.activity
 
 import android.app.Activity
 import android.content.Intent
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.widget.Button
 import android.widget.EditText
 import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
 import ch.sdp.vibester.R
+import ch.sdp.vibester.TestMode
+import ch.sdp.vibester.auth.FireBaseAuthenticator
+import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.database.ImageRepo
-import ch.sdp.vibester.database.UsersRepo
-import ch.sdp.vibester.util.Util
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
@@ -18,17 +19,21 @@ import javax.inject.Inject
 class CreateProfileActivity : AppCompatActivity() {
 
     @Inject
-    lateinit var usersRepo: UsersRepo
+    lateinit var dataGetter: DataGetter
 
     @Inject
     lateinit var imageRepo: ImageRepo
 
     private val REQUEST_CODE = 500
 
+    var isUnitTest: Boolean = false
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_create_profile)
 
+        isUnitTest = intent.getBooleanExtra("isUnitTest", false)
+
         val email = intent.getStringExtra("email").toString()
         val username = findViewById<EditText>(R.id.accountUsername)
 
@@ -36,10 +41,10 @@ class CreateProfileActivity : AppCompatActivity() {
         val btnUploadImg = findViewById<Button>(R.id.uploadImg)
 
         btCreateAcc.setOnClickListener {
-            usersRepo.createUser(
-                email,
-                username.text.toString(),
-                this::startNewActivity)
+            if (!TestMode.isTest()){
+                dataGetter.updateFieldString(FireBaseAuthenticator.getCurrentUID(), username.text.toString(), "username")
+            }
+            startNewActivity(email)
         }
 
         btnUploadImg.setOnClickListener {
@@ -50,6 +55,7 @@ class CreateProfileActivity : AppCompatActivity() {
     private fun startNewActivity(email: String) {
         val newIntent = Intent(this, ProfileActivity::class.java)
         newIntent.putExtra("email", email)
+        newIntent.putExtra("isUnitTest", isUnitTest)
 
         startActivity(newIntent)
     }
@@ -66,10 +72,11 @@ class CreateProfileActivity : AppCompatActivity() {
     }
 
 
+    //check the UID here not sure
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         if (resultCode == Activity.RESULT_OK && requestCode == REQUEST_CODE){
-            imageRepo.uploadFile("profileImg/${Util.createNewId()}", data?.data!!) { updateUI() }
+            imageRepo.uploadFile("profileImg/${FireBaseAuthenticator.getCurrentUID()}", data?.data!!) { updateUI() }
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
index aa680ad44..8c19cfa24 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
@@ -9,19 +9,18 @@ import android.content.IntentFilter
 import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Build
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.os.Environment
-import android.view.View
 import android.widget.Button
 import android.widget.TextView
 import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
 import ch.sdp.vibester.R
+import ch.sdp.vibester.TestMode
 import ch.sdp.vibester.api.ItunesMusicApi
 import ch.sdp.vibester.model.Song
 import okhttp3.OkHttpClient
-import org.w3c.dom.Text
-import java.lang.IllegalArgumentException
+
 /*
  * Activity that handles downloading of song extracts.
  */
@@ -35,30 +34,33 @@ class DownloadActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_download)
 
+
         val songNameView = findViewById<TextView>(R.id.download_songName)
         val downloadButton = findViewById<Button>(R.id.download_downloadsong)
 
-        downloadButton.setOnClickListener {
-            songName = songNameView.text.toString()
-            val songFuture = ItunesMusicApi.querySong(songName, OkHttpClient(), 1)
-            try {
-                song = Song.singleSong(songFuture.get())
-                checkPermissionsAndDownload()
-            } catch (e: IllegalArgumentException) {
-                alert("Unable to find song, please retry!", "Please retry!", songNameView)
+        if (!TestMode.isTest()) {
+            downloadButton.setOnClickListener {
+                songName = songNameView.text.toString()
+                val songFuture = ItunesMusicApi.querySong(songName, OkHttpClient(), 1)
+                try {
+                    song = Song.singleSong(songFuture.get())
+                    checkPermissionsAndDownload()
+                } catch (e: IllegalArgumentException) {
+                    alert("Unable to find song, please retry!", "Please retry!", songNameView)
+                }
             }
-        }
 
-        var broadcast = object:BroadcastReceiver() {
-            override fun onReceive(context: Context?, intent: Intent?) {
-                var id = intent?.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1)
-                if(id == downloadId) {
-                    alert("Download completed!", "Try another song!", songNameView)
+            var broadcast = object : BroadcastReceiver() {
+                override fun onReceive(context: Context?, intent: Intent?) {
+                    var id = intent?.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1)
+                    if (id == downloadId) {
+                        alert("Download completed!", "Try another song!", songNameView)
+                    }
                 }
             }
-        }
 
-        registerReceiver(broadcast, IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE))
+            registerReceiver(broadcast, IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE))
+        }
     }
 
     /*
diff --git a/app/src/main/java/ch/sdp/vibester/activity/GameActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/GameActivity.kt
index 265417400..e8e35ca48 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/GameActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/GameActivity.kt
@@ -3,10 +3,10 @@ package ch.sdp.vibester.activity
 import android.content.Context
 import android.content.Intent
 import android.content.res.ColorStateList
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Handler
 import android.view.Gravity
 import android.widget.*
+import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import ch.sdp.vibester.R
 import ch.sdp.vibester.api.BitmapGetterApi
diff --git a/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
index 0cf497f94..0c18f6f7a 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/GameEndingActivity.kt
@@ -4,18 +4,17 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import android.view.Window
-import android.widget.Button
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import ch.sdp.vibester.R
-import ch.sdp.vibester.model.UserSharedPref
 
-/*
+/**
  * A class representing the activity which appears upon
  * completion of a game. Shows various stats.
  */
 class GameEndingActivity : AppCompatActivity() {
 
+
     private var incorrectSongs: ArrayList<String>? = arrayListOf("Default song")
     private var statNames: ArrayList<String>? = arrayListOf(
         "Default name 1",
@@ -42,8 +41,8 @@ class GameEndingActivity : AppCompatActivity() {
 
         setContentView(R.layout.activity_game_ending_screen)
 
-        //Method to update score (locally and on DB)
-        UserSharedPref.updateScore(this, 1)
+        
+
 
         if (intent.hasExtra("Winner Name")) {
             val winner = intent.getStringExtra("Winner Name")
diff --git a/app/src/main/java/ch/sdp/vibester/activity/GameSetupActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/GameSetupActivity.kt
index adb620601..97ccf0ede 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/GameSetupActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/GameSetupActivity.kt
@@ -3,6 +3,7 @@ package ch.sdp.vibester.activity
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.util.Log
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
@@ -15,7 +16,9 @@ import ch.sdp.vibester.api.LastfmApiInterface
 import ch.sdp.vibester.api.LastfmMethod
 import ch.sdp.vibester.api.LastfmUri
 import ch.sdp.vibester.helper.GameManager
+import ch.sdp.vibester.helper.IntentSwitcher
 import ch.sdp.vibester.helper.TypingGameManager
+import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.gson.Gson
 import retrofit2.Call
 import retrofit2.Callback
@@ -36,6 +39,22 @@ class GameSetupActivity : AppCompatActivity(), AdapterView.OnItemSelectedListene
         setContentView(R.layout.activity_game_setup_screen)
         val ctx: Context = this
 
+        val retButton: FloatingActionButton = findViewById(R.id.gameSetup_returnToMain)
+
+        retButton.setOnClickListener {
+            if(findViewById<LinearLayout>(R.id.chooseGame).visibility == VISIBLE){
+                IntentSwitcher.switchBackToWelcome(this)
+                finish()
+            }else if (findViewById<ConstraintLayout>(R.id.chooseGenre).visibility == VISIBLE){
+                findViewById<LinearLayout>(R.id.chooseGame).visibility = VISIBLE
+                findViewById<ConstraintLayout>(R.id.chooseGenre).visibility = GONE
+            }else if (findViewById<ConstraintLayout>(R.id.chooseDifficulty).visibility == VISIBLE){
+                findViewById<ConstraintLayout>(R.id.chooseGenre).visibility = VISIBLE
+                findViewById<ConstraintLayout>(R.id.chooseDifficulty).visibility = GONE
+            }
+        }
+
+
         val spinnerDifficulty: Spinner = findViewById(R.id.difficulty_spinner)
         val adapter = ArrayAdapter.createFromResource(
             ctx,
diff --git a/app/src/main/java/ch/sdp/vibester/activity/LyricsBelongGameActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/LyricsBelongGameActivity.kt
index d66e674b2..9ce71fa09 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/LyricsBelongGameActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/LyricsBelongGameActivity.kt
@@ -7,7 +7,7 @@ import android.speech.RecognizerIntent
 import android.view.View
 import android.widget.*
 import ch.sdp.vibester.R
-import ch.sdp.vibester.api.*
+import ch.sdp.vibester.api.LyricsOVHApiInterface
 import ch.sdp.vibester.helper.GameManager
 import ch.sdp.vibester.model.Lyric
 import retrofit2.Call
diff --git a/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
index 63142db0b..303b81256 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
@@ -13,8 +13,8 @@ import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import ch.sdp.vibester.R
 import ch.sdp.vibester.api.BitmapGetterApi
-import ch.sdp.vibester.model.UserSharedPref
-import ch.sdp.vibester.database.UsersRepo
+import ch.sdp.vibester.auth.FireBaseAuthenticator
+import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.helper.IntentSwitcher
 import ch.sdp.vibester.user.User
 import com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -30,7 +30,7 @@ import javax.inject.Inject
 @AndroidEntryPoint
 class ProfileActivity : AppCompatActivity() {
     @Inject
-    lateinit var usersRepo: UsersRepo
+    lateinit var dataGetter: DataGetter
 
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -41,8 +41,6 @@ class ProfileActivity : AppCompatActivity() {
 
         setContentView(R.layout.activity_profile)
 
-        setupProfile(UserSharedPref.getUser(applicationContext))
-
         val editUsername = findViewById<Button>(R.id.editUser)
 
         val logoutButton = findViewById<Button>(R.id.logout)
@@ -55,11 +53,27 @@ class ProfileActivity : AppCompatActivity() {
 
         retToMain.setOnClickListener{
             IntentSwitcher.switchBackToWelcome(this)
+            finish()
         }
 
         logoutButton.setOnClickListener{
             FirebaseAuth.getInstance().signOut()
             IntentSwitcher.switchBackToWelcome(this)
+            finish()
+        }
+
+        // Do not enable querying database while executing unit test
+        val isUnitTest: Boolean = intent.getBooleanExtra("isUnitTest", false)
+
+        if (!isUnitTest) {
+            queryDatabase()
+        } else {
+            var upTest: User? = intent.getSerializableExtra("userTestProfile") as User?
+            if (upTest == null) {
+                setupProfile(User())
+            } else {
+                setupProfile(upTest)
+            }
         }
 
     }
@@ -87,7 +101,7 @@ class ProfileActivity : AppCompatActivity() {
             findViewById<TextView>(textId).text = input.text.toString()
 
             if(name == "username"){
-                UserSharedPref.updateUsername(this, input.text.toString())
+                dataGetter.updateFieldString(FireBaseAuthenticator.getCurrentUID(), input.text.toString(), "username")
             }
         }
 
@@ -110,8 +124,9 @@ class ProfileActivity : AppCompatActivity() {
      * Hard coded for now
      */
 
-    private fun queryDatabase(email: String) {
-        usersRepo.getUserData(email, this::setupProfile)
+
+    private fun queryDatabase() {
+        dataGetter.getUserData(this::setupProfile)
     }
 
 
diff --git a/app/src/main/java/ch/sdp/vibester/activity/SearchUserActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/SearchUserActivity.kt
index bd3b1fa28..69885b29f 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/SearchUserActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/SearchUserActivity.kt
@@ -9,7 +9,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import ch.sdp.vibester.R
-import ch.sdp.vibester.database.UsersRepo
+import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.user.User
 
 import ch.sdp.vibester.user.UserProfileAdapter
@@ -23,7 +23,7 @@ class SearchUserActivity : AppCompatActivity() {
 
     private var recyclerView: RecyclerView? = null
     private var searchEditText: EditText? = null
-    var usersRepo = UsersRepo()
+    var usersRepo = DataGetter()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/app/src/main/java/ch/sdp/vibester/activity/TypingGameActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/TypingGameActivity.kt
index 09eaa8dfa..c1f6ac45e 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/TypingGameActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/TypingGameActivity.kt
@@ -9,7 +9,10 @@ import android.widget.*
 import androidx.core.content.ContextCompat.getColor
 import androidx.core.widget.addTextChangedListener
 import ch.sdp.vibester.R
+import ch.sdp.vibester.TestMode
 import ch.sdp.vibester.api.ItunesMusicApi
+import ch.sdp.vibester.auth.FireBaseAuthenticator
+import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.helper.DisplayContents
 import ch.sdp.vibester.helper.GameManager
 import ch.sdp.vibester.helper.TypingGameManager
@@ -207,9 +210,16 @@ class TypingGameActivity : GameActivity() {
         super.endRound(gameManager)
         //TODO: is it ok for the last round to go to the end game directly without waiting for the next btn?
         toggleNextBtnVisibility(true)
-        /*if (endGame(gameManager)) {
-            switchToEnding(gameManager)
-        }*/
+
+        // If currently not in test and has finished the game, update the scores
+        if (isEndGame(gameManager) && !TestMode.isTest()) {
+            val dataGetter = DataGetter()
+            dataGetter.updateRelativeFieldInt(FireBaseAuthenticator.getCurrentUID(), 1, "totalGames")
+            dataGetter.updateRelativeFieldInt(FireBaseAuthenticator.getCurrentUID(), gameManager.getCorrectSongs().size, "correctSongs")
+            dataGetter.updateBestFieldInt(FireBaseAuthenticator.getCurrentUID(), gameManager.getScore(), "bestScore")
+
+        }
+
     }
 
     /**
diff --git a/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt
index e57772121..eee7c7638 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt
@@ -1,17 +1,20 @@
 package ch.sdp.vibester.activity
 
-//import ch.sdp.vibester.profile.ProfileDataProvider
 import android.content.Intent
 import android.os.Bundle
+import android.util.Log
 import android.view.View
 import android.view.Window.FEATURE_NO_TITLE
+import android.widget.Button
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import ch.sdp.vibester.R
+import ch.sdp.vibester.TestMode
+import ch.sdp.vibester.api.InternetState
 import ch.sdp.vibester.auth.FireBaseAuthenticator
-import com.google.firebase.database.ktx.database
-import com.google.firebase.ktx.Firebase
-import ch.sdp.vibester.model.UserSharedPref
+import ch.sdp.vibester.database.Database
+import ch.sdp.vibester.database.PersistanceSetter
+
 
 class WelcomeActivity : AppCompatActivity() {
 
@@ -37,7 +40,11 @@ class WelcomeActivity : AppCompatActivity() {
             userStatusTextValue.text = "User: " + FireBaseAuthenticator.getCurrentUserMail()
         }
 
+        val startOfApp = !PersistanceSetter.getPersistance()
 
+        Log.e("INFO: Should Access", ((InternetState.hasAccessedInternetOnce(this))).toString())
+        PersistanceSetter.setPersistance()
+        Database.get()
     }
 
     private fun sendDirectIntent(arg: Class<*>?) {
@@ -66,6 +73,12 @@ class WelcomeActivity : AppCompatActivity() {
     }
 
     fun switchToSearch(view: View) {
-        sendDirectIntent(SearchUserActivity::class.java)
+        // Disable User Search if not connected
+        if(!FireBaseAuthenticator.isLoggedIn() && !TestMode.isTest()){
+            val buttonToSearchUser = findViewById<Button>(R.id.welcome_search)
+            buttonToSearchUser.isEnabled = false
+        }else{
+            sendDirectIntent(SearchUserActivity::class.java)
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/api/InternetState.kt b/app/src/main/java/ch/sdp/vibester/api/InternetState.kt
new file mode 100644
index 000000000..b37967626
--- /dev/null
+++ b/app/src/main/java/ch/sdp/vibester/api/InternetState.kt
@@ -0,0 +1,32 @@
+package ch.sdp.vibester.api
+
+import android.content.Context
+import android.net.ConnectivityManager
+
+class InternetState private constructor(){
+    companion object{
+        /**
+         * Get Internet Connection Status
+         * @return return true if connected; false otherwise
+         */
+        fun getInternetStatus(ctx: Context): Boolean{
+            val connectivityManager = ctx.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+            val networkInfo = connectivityManager.activeNetworkInfo
+            var isNetwork: Boolean = false
+
+            if(networkInfo != null){
+                isNetwork = networkInfo.isConnected
+            }
+            return isNetwork
+        }
+
+        private var hasAlreadyAccessedInternetOnce: Boolean = false
+        fun hasAccessedInternetOnce(ctx: Context):Boolean{
+            if (!hasAlreadyAccessedInternetOnce && getInternetStatus(ctx)) {
+                hasAlreadyAccessedInternetOnce = true
+            }
+            return hasAlreadyAccessedInternetOnce
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt b/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
index 4927867a1..cc5d4a24a 100644
--- a/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
+++ b/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
@@ -1,18 +1,22 @@
 package ch.sdp.vibester.auth
 
+
+import android.content.Context
 import android.content.Intent
+import com.google.android.gms.auth.api.identity.Identity
 import com.google.android.gms.auth.api.signin.GoogleSignIn
-import com.google.android.gms.common.api.ApiException
 import com.google.android.gms.tasks.Task
 import com.google.firebase.auth.AuthResult
 import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.auth.FirebaseUser
+import com.google.firebase.auth.GoogleAuthProvider
 import com.google.firebase.auth.ktx.auth
 import com.google.firebase.ktx.Firebase
 import javax.inject.Inject
 
 class FireBaseAuthenticator @Inject constructor() {
     companion object{
+        private val AUTHENTICATION_PERMISSION_CODE = 1000
 
         /**
          * API: return true if firebase authentication is logged in
@@ -25,10 +29,46 @@ class FireBaseAuthenticator @Inject constructor() {
          * API: return the mail of the user if logged in otherwise empty string
          */
         fun getCurrentUserMail(): String {
+            var mail = ""
+            if (isLoggedIn()) {
+                mail = FirebaseAuth.getInstance().currentUser!!.email.toString()
+            }
+            return mail
+        }
+
+        /**
+         * API: return the uid of the user if logged in otherwise empty string
+         */
+        fun getCurrentUID(): String {
+            var uid = ""
             if (isLoggedIn()) {
-                return FirebaseAuth.getInstance().currentUser!!.email.toString()
+                uid = FirebaseAuth.getInstance().currentUser!!.uid
+            }
+            return uid
+        }
+
+
+        /**
+         * A function to return the result of google sign in
+         * @param requestCode a request code
+         * @param resultCode a result code
+         * @param data intent returned from google sign in
+         * @param ctx current app context
+         */
+        fun googleActivityResult(requestCode: Int, resultCode: Int, data: Intent?, ctx: Context): String? {
+            if (requestCode == AUTHENTICATION_PERMISSION_CODE) {
+                try {
+                    val account = GoogleSignIn.getSignedInAccountFromIntent(data).result
+                    val client = Identity.getSignInClient(ctx)
+                    val idToken = client.getSignInCredentialFromIntent(data).googleIdToken
+                    val credential = GoogleAuthProvider.getCredential(idToken, null)
+                    FirebaseAuth.getInstance().signInWithCredential(credential)
+                    return account.email
+                } catch (e: Exception) {
+                    return "Authentication error"
+                }
             } else {
-                return ""
+                return "Authentication error"
             }
         }
 
@@ -36,6 +76,15 @@ class FireBaseAuthenticator @Inject constructor() {
 
     private val auth: FirebaseAuth = Firebase.auth
 
+
+    /**
+     * Getter for the current user
+     */
+    fun getCurrUser(): FirebaseUser? {
+        return Firebase.auth.currentUser
+    }
+
+
     /**
      * A function to log in with email and password
      * @param email email
@@ -52,32 +101,9 @@ class FireBaseAuthenticator @Inject constructor() {
      * @param password passwprd
      * @return Task of the result
      */
-
     fun createAccount(email: String, password: String): Task<AuthResult> {
         return auth.createUserWithEmailAndPassword(email, password)
     }
 
-    fun getCurrUser(): FirebaseUser? {
-        return auth.currentUser
-    }
 
-    /**
-     * A function to return the result of google sign in
-     * @param requestCode a request code
-     * @param resultCode a result code
-     * @param data intent returned from google sign in
-     */
-    fun googleActivityResult(requestCode: Int, resultCode: Int, data: Intent?): String? {
-        return if (requestCode == 1000) {
-            val task = GoogleSignIn.getSignedInAccountFromIntent(data)
-            try {
-                val account = task.getResult(ApiException::class.java)!!
-                account.email
-            } catch (e: ApiException) {
-                "Authentication error"
-            }
-        } else {
-            "Authentication error"
-        }
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/database/UsersRepo.kt b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
similarity index 71%
rename from app/src/main/java/ch/sdp/vibester/database/UsersRepo.kt
rename to app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
index d679609d2..8c7ce8ca7 100644
--- a/app/src/main/java/ch/sdp/vibester/database/UsersRepo.kt
+++ b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
@@ -2,9 +2,9 @@ package ch.sdp.vibester.database
 
 import android.content.ContentValues
 import android.util.Log
+import ch.sdp.vibester.TestMode
 import ch.sdp.vibester.auth.FireBaseAuthenticator
 import ch.sdp.vibester.user.User
-import ch.sdp.vibester.util.Util
 import com.google.firebase.database.DataSnapshot
 import com.google.firebase.database.DatabaseError
 import com.google.firebase.database.ValueEventListener
@@ -15,7 +15,7 @@ import javax.inject.Inject
  * The users class which handled all the interactions with the database that are linked to users
  */
 
-class UsersRepo @Inject constructor() {
+class DataGetter @Inject constructor() {
     private val dbRef = Database.get().getReference("users")
     val authenticator: FireBaseAuthenticator = FireBaseAuthenticator()
 
@@ -27,7 +27,7 @@ class UsersRepo @Inject constructor() {
      * @param fieldName the field name of the field that is being updated
      */
     fun updateFieldString(userID: String, newVal: String, fieldName: String) {
-        dbRef.child(userID) //For now ID is hardcoded, will generate it creating new users next week "testUser"
+        dbRef.child(userID)
             .child(fieldName)
             .setValue(newVal)
     }
@@ -39,12 +39,47 @@ class UsersRepo @Inject constructor() {
      * @param fieldName the field name of the field that is being updated
      */
     fun updateFieldInt(userID: String, newVal: Int, fieldName: String) {
-        dbRef.child(userID) //For now ID is hardcoded, will generate it creating new users next week "testUser"
+        dbRef.child(userID)
             .child(fieldName)
             .setValue(newVal)
     }
 
 
+    /**
+     * This function increments a specific int field of a user in the database
+     * @param userID the id of the user which is being updated
+     * @param newVal (Int) the increment value of the field that is being updated
+     * @param fieldName the field name of the field that is being updated
+     */
+    fun updateRelativeFieldInt(userID: String, newVal: Int, fieldName: String) {
+        if(!TestMode.isTest()) {
+            dbRef.child(userID).child(fieldName)
+                .get().addOnSuccessListener { t ->
+                    if(!TestMode.isTest()) {
+                        updateFieldInt(userID, (t.value as Long?)!!.toInt() + newVal, fieldName)
+                    }
+                }
+        }
+    }
+
+    /**
+     * This function sets the best between current and given in argument value
+     * @param userID the id of the user which is being updated
+     * @param newVal (Int) the new value of the field that is being compared and updated
+     * @param fieldName the field name of the field that is being updated
+     */
+    fun updateBestFieldInt(userID: String, newVal: Int, fieldName: String) {
+        if(!TestMode.isTest()) {
+            dbRef.child(userID).child(fieldName)
+                .get().addOnSuccessListener { t ->
+                    if(!TestMode.isTest()) {
+                        updateFieldInt(userID, maxOf((t.value as Long?)!!.toInt(), newVal), fieldName)
+                    }
+                }
+        }
+    }
+
+
     /**
      * Update a subfield of user's field
      * @param userID the id of the user which is being updated
@@ -64,11 +99,11 @@ class UsersRepo @Inject constructor() {
      * @param email the email of the new user
      * @param username the username of the new user
      * @param callback function to be called when the the user has been created
+     * @param uid id of the new user
      */
-    fun createUser(email: String, username: String, callback: (String) -> Unit) {
-        var newUser = User(username, "", email, 0, 0, 0, 0)
-        val newId = Util.createNewId()
-        dbRef.child(newId).setValue(newUser)
+    fun createUser(email: String, username: String, callback: (String) -> Unit, uid: String) {
+        var newUser = User(username, "", email, 0, 0, 0, 0, uid)
+        dbRef.child(uid).setValue(newUser)
             .addOnSuccessListener {
                 callback(email)
             }
@@ -98,7 +133,6 @@ class UsersRepo @Inject constructor() {
                 for (snapshot in dataSnapshot.children) {
                     val userProfile:User? = snapshot.getValue(User::class.java)
                     if (userProfile != null) {
-                        userProfile.uid = snapshot.key.toString()
                         users.add(userProfile)
                     }
                 }
@@ -112,16 +146,15 @@ class UsersRepo @Inject constructor() {
 
     /**
      * This functions fetches the data of the given user from the database
-     * @param email the of the user
      * @param callback the function to be called when the data of the appropriate user is available
      */
-    fun getUserData(email: String, callback: (User) -> Unit) {
+    fun getUserData(callback: (User) -> Unit) {
         dbRef.addValueEventListener(object : ValueEventListener {
             override fun onDataChange(dataSnapshot: DataSnapshot) {
                 for (dataSnapShot in dataSnapshot.children) {
                     val dbContents = dataSnapShot.getValue<User>()
                     if (dbContents != null) {
-                        if(dbContents.email == email) {
+                        if(FireBaseAuthenticator.isLoggedIn() && dbContents.email == FireBaseAuthenticator.getCurrentUserMail()) {
                             callback(dbContents)
                             break
                         }
diff --git a/app/src/main/java/ch/sdp/vibester/database/Database.kt b/app/src/main/java/ch/sdp/vibester/database/Database.kt
index 16124e2dd..13a5763e8 100644
--- a/app/src/main/java/ch/sdp/vibester/database/Database.kt
+++ b/app/src/main/java/ch/sdp/vibester/database/Database.kt
@@ -7,7 +7,6 @@ import com.google.firebase.ktx.Firebase
 /**
  * The Database objects that returns our database instance
  */
-
 object Database {
     fun get(): FirebaseDatabase {
         return Firebase.database("https://vibester-sdp-default-rtdb.europe-west1.firebasedatabase.app")
diff --git a/app/src/main/java/ch/sdp/vibester/database/PersistanceSetter.kt b/app/src/main/java/ch/sdp/vibester/database/PersistanceSetter.kt
new file mode 100644
index 000000000..659c15d74
--- /dev/null
+++ b/app/src/main/java/ch/sdp/vibester/database/PersistanceSetter.kt
@@ -0,0 +1,33 @@
+package ch.sdp.vibester.database
+
+import com.google.firebase.database.ktx.database
+import com.google.firebase.ktx.Firebase
+
+/**
+ * Enable Persistance in Firebase database.
+ * If internet connection is lost while app is on, it continues to work
+ */
+class PersistanceSetter private constructor(){
+    companion object{
+        private var alreadyExecuted : Boolean = false
+
+        /**
+         * Turn on the persistance
+         */
+        fun setPersistance(){
+            if (!alreadyExecuted) {
+                Firebase.database.setPersistenceEnabled(true)
+                alreadyExecuted = true
+            }
+        }
+
+        /**
+         * Getter to check whether it has been turned on
+         * @return Boolean
+         */
+        fun getPersistance(): Boolean{
+            return alreadyExecuted
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/model/UserSharedPref.kt b/app/src/main/java/ch/sdp/vibester/model/UserSharedPref.kt
deleted file mode 100644
index 7cd04cf98..000000000
--- a/app/src/main/java/ch/sdp/vibester/model/UserSharedPref.kt
+++ /dev/null
@@ -1,147 +0,0 @@
-package ch.sdp.vibester.model
-
-import android.content.Context
-import android.content.SharedPreferences
-import android.preference.PreferenceManager
-import ch.sdp.vibester.database.UsersRepo
-import ch.sdp.vibester.user.User
-import com.google.firebase.database.*
-import java.util.*
-
-/**
- * This static class store the users data offline + in the db
- */
-class UserSharedPref private constructor() {
-    companion object{
-        val USERNAME = "username"
-        val IMAGE = "image"
-        val EMAIL = "email"
-        val TOTAL_GAMES = "totalGames"
-        val BEST_SCORE = "bestScore"
-        val CORRECT_SONGS = "correctSongs"
-        val RANKING = "ranking"
-        val ONLINE = "online"
-
-        var dbAccess : UsersRepo = UsersRepo()
-
-
-        private fun getSharedPreferences(ctx: Context): SharedPreferences? {
-            return PreferenceManager.getDefaultSharedPreferences(ctx)
-        }
-
-        /**
-         * Reset the current user stored locally with a retrieved one from db
-         * @param Context The app context
-         * @param email the email of the user
-         * @param online if false, does not store in db
-         */
-        fun userReset(ctx: Context, email: String, online: Boolean = true){
-            setUser(ctx, User(email=email), online)
-            if (online){
-                dbAccess = UsersRepo()
-                val call = {prof: User -> setUser(ctx, prof, online)}
-                dbAccess.getUserData(email, call)
-            }
-        }
-
-        /**
-         * Set the user locally by hand
-         * @param Context The app context
-         * @param UserProfile the profile of the user
-         * @param online if false, does not store in db
-         */
-        fun setUser(ctx: Context, user: User, online: Boolean){
-            val edit = getSharedPreferences(ctx)?.edit()
-            if (edit != null) {
-                edit.putString(USERNAME, user.username)
-                edit.putString(IMAGE, user.image)
-                edit.putString(EMAIL, user.email)
-                edit.putInt(TOTAL_GAMES, user.totalGames)
-                edit.putInt(BEST_SCORE, user.bestScore)
-                edit.putInt(CORRECT_SONGS, user.correctSongs)
-                edit.putInt(RANKING, user.ranking)
-                edit.putBoolean(ONLINE, online)
-                edit.commit()
-            }
-        }
-
-        /**
-         * Update the score locally and in db (if enabled for the user)
-         * @param Context The app context
-         * @param deltaTotal how much increase the ranking
-         * @param deltaBest how much increase best_score
-         * @param deltaCorrect how much increase correct guesses song
-         * @param deltaRanking How much increase ranking
-         */
-        fun updateScore(ctx: Context, deltaTotal: Int = 0, deltaBest: Int = 0, deltaCorrect: Int = 0, deltaRanking: Int = 0){
-            val sharedPref = getSharedPreferences(ctx)
-            if(sharedPref != null){
-                val edit = sharedPref.edit()
-                val current_total_games = sharedPref.getInt(TOTAL_GAMES, 0) + deltaTotal
-                val current_best_score = sharedPref.getInt(BEST_SCORE, 0) + deltaBest
-                val current_correct_song = sharedPref.getInt(CORRECT_SONGS, 0) + deltaCorrect
-                val current_ranking = sharedPref.getInt(RANKING, 0) + deltaRanking
-                if(sharedPref.getBoolean(ONLINE, false)) {
-                    dbAccess.updateFieldInt("testUser", current_total_games, "totalGames")
-                    dbAccess.updateFieldInt("testUser", current_ranking, "ranking")
-                    dbAccess.updateFieldInt("testUser", current_correct_song, "correctSongs")
-                    dbAccess.updateFieldInt("testUser", current_best_score, "bestScore")
-                }
-                edit.putInt(TOTAL_GAMES, current_total_games)
-                edit.putInt(BEST_SCORE, current_best_score)
-                edit.putInt(CORRECT_SONGS, current_correct_song)
-                edit.putInt(RANKING, current_ranking)
-                edit.commit()
-            }
-        }
-
-        /**
-         * Update the username locally and in db (if enabled for the user)
-         * @param Context The app context
-         * @param username new username
-         */
-        fun updateUsername(ctx: Context, username: String){
-            val sharedPref = getSharedPreferences(ctx)
-            if(sharedPref != null){
-                val edit = sharedPref.edit()
-                edit.putString(USERNAME, username)
-                if(sharedPref.getBoolean(ONLINE, false)) {
-                    dbAccess.updateFieldString("testUser", username, "username")
-                }
-                edit.commit()
-            }
-        }
-
-
-        /**
-         * Getter for locally store profile
-         * @param Context The app context
-         * @return UserProfile
-         */
-        fun getUser(ctx: Context): User {
-            val sharedPref = getSharedPreferences(ctx)
-
-            var username = ""
-            var image = ""
-            var email = ""
-            var totalGames = -1
-            var bestScore = -1
-            var correctSongs = -1
-            var ranking = -1
-
-            if(sharedPref != null) {
-                username = sharedPref.getString(USERNAME, "").toString()
-                image = sharedPref.getString(IMAGE, "").toString()
-                email = sharedPref.getString(EMAIL, "").toString()
-                totalGames = sharedPref.getInt(TOTAL_GAMES, 0)
-                bestScore = sharedPref.getInt(BEST_SCORE, 0)
-                correctSongs = sharedPref.getInt(CORRECT_SONGS, 0)
-                ranking = sharedPref.getInt(RANKING, 0)
-            }
-            return User(username, image, email, totalGames, bestScore, correctSongs, ranking)
-
-        }
-
-
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt b/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt
index f6467fe97..dc7087e40 100644
--- a/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt
+++ b/app/src/main/java/ch/sdp/vibester/user/UserProfileAdapter.kt
@@ -9,7 +9,7 @@ import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import ch.sdp.vibester.R
 import ch.sdp.vibester.auth.FireBaseAuthenticator
-import ch.sdp.vibester.database.UsersRepo
+import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.helper.loadImg
 
 /**
@@ -19,7 +19,7 @@ class UserProfileAdapter constructor(val users: MutableList<User>):
     RecyclerView.Adapter<UserProfileAdapter.UserProfileViewHolder>() {
 
     val authenticator: FireBaseAuthenticator = FireBaseAuthenticator()
-    val usersRepo: UsersRepo = UsersRepo()
+    val usersRepo: DataGetter = DataGetter()
     /**
      * Create a RecycleView layout with the userProfile view as an item
      */
diff --git a/app/src/main/java/ch/sdp/vibester/util/Util.kt b/app/src/main/java/ch/sdp/vibester/util/Util.kt
deleted file mode 100644
index e2057df6e..000000000
--- a/app/src/main/java/ch/sdp/vibester/util/Util.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package ch.sdp.vibester.util
-
-class Util {
-    companion object {
-        /**
-         * A function that generates a random ID for database storage
-         */
-        fun createNewId(): String {
-            val charPool : List<Char> = ('a'..'z') + ('A'..'Z') + ('0'..'9')
-            val newId = (1..10)
-                .map { i -> kotlin.random.Random.nextInt(0, charPool.size) }
-                .map(charPool::get)
-                .joinToString("");
-
-            return newId
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_authentication.xml b/app/src/main/res/layout/activity_authentication.xml
index 84ec7a43e..15b2109e5 100644
--- a/app/src/main/res/layout/activity_authentication.xml
+++ b/app/src/main/res/layout/activity_authentication.xml
@@ -7,13 +7,24 @@
     android:background="@color/floral_white"
     tools:context=".activity.AuthenticationActivity">
 
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/authentication_returnToMain"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="16dp"
+        android:backgroundTint="@color/light_coral"
+        android:clickable="true"
+        android:src="@android:drawable/ic_menu_revert"
+        app:borderWidth="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
     <TextView
         android:id="@+id/email"
-        android:layout_width="357dp"
-        android:layout_height="220dp"
-        android:layout_marginStart="27dp"
+        android:layout_width="367dp"
+        android:layout_height="211dp"
         android:layout_marginTop="100dp"
-        android:layout_marginEnd="27dp"
         android:fontFamily="monospace"
         android:text="@string/authentication_noActionDoneYet"
         android:textAlignment="center"
@@ -21,7 +32,7 @@
         android:textSize="25sp"
         app:layout_constraintBottom_toTopOf="@+id/scrollView2"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintHorizontal_bias="0.636"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/app/src/main/res/layout/activity_game_setup_screen.xml b/app/src/main/res/layout/activity_game_setup_screen.xml
index 65022f20a..8d4b644ac 100644
--- a/app/src/main/res/layout/activity_game_setup_screen.xml
+++ b/app/src/main/res/layout/activity_game_setup_screen.xml
@@ -8,7 +8,21 @@
     android:noHistory="true"
     tools:context=".activity.GameSetupActivity">
 
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/gameSetup_returnToMain"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="16dp"
+        android:backgroundTint="@color/light_coral"
+        android:clickable="true"
+        android:src="@android:drawable/ic_menu_revert"
+        app:borderWidth="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
     <LinearLayout
+        android:id="@+id/linearLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
@@ -153,8 +167,8 @@
                             android:background="@drawable/squared_button"
                             android:backgroundTint="@color/cg_blue"
                             android:elevation="10dp"
-                            android:stateListAnimator="@null"
                             android:onClick="chooseGame"
+                            android:stateListAnimator="@null"
                             android:text="@string/game_buzzer_title"
                             android:textColor="@color/white"
                             android:translationZ="10dp" />
diff --git a/app/src/main/res/layout/activity_welcome_screen.xml b/app/src/main/res/layout/activity_welcome_screen.xml
index 18ef2d478..2a33c1740 100644
--- a/app/src/main/res/layout/activity_welcome_screen.xml
+++ b/app/src/main/res/layout/activity_welcome_screen.xml
@@ -94,12 +94,12 @@
                 android:layout_marginTop="10dp"
                 android:backgroundTint="@color/cg_blue"
                 android:elevation="10dp"
+                android:enabled="false"
                 android:stateListAnimator="@null"
                 android:text="@string/welcomeScreen_settings"
                 android:translationZ="10dp"
-                app:icon="@android:drawable/ic_menu_manage"
-                android:enabled="false"
-                />
+                android:visibility="gone"
+                app:icon="@android:drawable/ic_menu_manage" />
 
             <Button
                 android:id="@+id/welcome_download"
@@ -124,7 +124,8 @@
                 android:onClick="switchToSearch"
                 android:stateListAnimator="@null"
                 android:text="@string/search_users"
-                android:translationZ="10dp"/>
+                android:translationZ="10dp"
+                app:icon="@android:drawable/ic_menu_search" />
 
 
             <Space
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4c9a533ad..f89818dfb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,7 +15,7 @@
     <string name="authentication_placeholderHandle">Placeholder Handle</string>
     <string name="authentication_placeholderUsername">Placeholder Username</string>
     <string name="authentication_placeholderEmptyScore">Error</string>
-    <string name="authentication_noActionDoneYet">Either log in with your google account or fill in credentials to create an account or log in</string>
+    <string name="authentication_noActionDoneYet">Either log in with your Google account or fill in credentials to create an account or log in</string>
 
     <!-- OLD String-->