diff --git a/app/build.gradle b/app/build.gradle
index bf015b3ac..a960a281f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,6 +3,7 @@ plugins {
     id 'org.jetbrains.kotlin.android'
     id 'jacoco'
     id 'kotlin-kapt'
+    id 'dagger.hilt.android.plugin'
 }
 
 jacoco {
@@ -29,7 +30,8 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+//        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "ch.sdp.vibester.CustomTestRunner"
     }
 
     buildTypes {
@@ -53,6 +55,11 @@ android {
         unitTests {
             includeAndroidResources = true
         }
+        packagingOptions {
+            jniLibs {
+                useLegacyPackaging true
+            }
+        }
     }
     buildFeatures {
         viewBinding true
@@ -87,7 +94,6 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-intents:3.4.0'
     androidTestImplementation 'com.android.support.test.espresso:espresso-contrib:3.0.2'
     implementation platform('com.google.firebase:firebase-bom:29.1.0')
-    implementation 'com.google.dagger:dagger:2.38.1'
     implementation 'com.google.firebase:firebase-analytics-ktx'
     implementation 'de.hdodenhof:circleimageview:3.1.0'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
@@ -97,7 +103,16 @@ dependencies {
         exclude group: 'com.android.support'
     })
     kapt 'com.github.bumptech.glide:compiler:4.13.0'
-    kapt 'com.google.dagger:dagger-compiler:2.28.3'
+
+    androidTestImplementation 'com.google.dagger:hilt-android-testing:2.38.1'
+    kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.38.1'
+
+    implementation "com.google.dagger:hilt-android:2.38.1"
+    kapt "com.google.dagger:hilt-compiler:2.38.1"
+
+    testImplementation "io.mockk:mockk:1.12.3"
+    androidTestImplementation "io.mockk:mockk-android:1.12.3"
+
 }
 
 tasks.withType(Test) {
@@ -118,7 +133,6 @@ task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest', 'crea
             '**/Manifest*.*',
             '**/*Test*.*',
             'android/**/*.*',
-            // Exclude Hilt generated classes
             '**/*Hilt*.*',
             'hilt_aggregated_deps/**',
             '**/*_Factory.class',
diff --git a/app/src/androidTest/java/ch/sdp/vibester/CustomTestRunner.kt b/app/src/androidTest/java/ch/sdp/vibester/CustomTestRunner.kt
new file mode 100644
index 000000000..6cb2e3601
--- /dev/null
+++ b/app/src/androidTest/java/ch/sdp/vibester/CustomTestRunner.kt
@@ -0,0 +1,14 @@
+package ch.sdp.vibester
+
+import android.app.Application
+import android.content.Context
+import androidx.test.runner.AndroidJUnitRunner
+import dagger.hilt.android.testing.HiltTestApplication
+
+// A custom runner to set up the instrumented application class for tests.
+class CustomTestRunner : AndroidJUnitRunner() {
+
+    override fun newApplication(cl: ClassLoader?, name: String?, context: Context?): Application {
+        return super.newApplication(cl, HiltTestApplication::class.java.name, context)
+    }
+}
\ 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 7f760ad0d..1d218c49e 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/AuthenticationActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/AuthenticationActivityTest.kt
@@ -1,10 +1,12 @@
 package ch.sdp.vibester.activity
 
+import android.app.Activity
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.action.ViewActions.closeSoftKeyboard
 import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.core.internal.deps.guava.base.Joiner.on
 import androidx.test.espresso.intent.Intents
 import androidx.test.espresso.intent.matcher.IntentMatchers
 import androidx.test.espresso.matcher.ViewMatchers.withId
@@ -14,12 +16,25 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import ch.sdp.vibester.R
 import ch.sdp.vibester.auth.FireBaseAuthenticator
+import com.google.android.gms.tasks.OnCompleteListener
+import com.google.android.gms.tasks.Task
+import com.google.firebase.auth.AuthResult
+import com.google.firebase.auth.FirebaseUser
+import dagger.hilt.android.testing.BindValue
+import dagger.hilt.android.testing.HiltAndroidRule
+import dagger.hilt.android.testing.HiltAndroidTest
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.verify
+//import io.mockk.mockk
 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
+import org.mockito.Mockito.mock
+import java.util.concurrent.Executor
 import kotlin.random.Random
 
 
@@ -29,11 +44,42 @@ import kotlin.random.Random
  * See [testing documentation](http://d.android.com/tools/testing).
  */
 @RunWith(AndroidJUnit4::class)
+@HiltAndroidTest
 class AuthenticationActivityTest {
     private val sleepTime: Long = 5000
 
+    @get:Rule(order = 0)
+    var hiltRule = HiltAndroidRule(this)
+
+    @get:Rule(order = 1)
+    val testRule = ActivityScenarioRule(
+        AuthenticationActivity::class.java
+    )
+
+    @BindValue @JvmField
+    val mockAuthenticator = mockk<FireBaseAuthenticator>()
+
+    private fun createMockTask(succesful: Boolean): Task<AuthResult> {
+        val taskResult = mockk<Task<AuthResult>>()
+
+        every {taskResult.isSuccessful} returns succesful
+        every {taskResult.addOnCompleteListener(any<Activity>(), any<OnCompleteListener<AuthResult>>())} answers {
+            secondArg<OnCompleteListener<AuthResult>>().onComplete(taskResult)
+            taskResult
+        }
+
+        return taskResult
+    }
+
+    private fun createMockUser(email: String): FirebaseUser {
+        val mockUser = mockk<FirebaseUser>()
+        every { mockUser.email } returns email
+        return mockUser
+    }
+
     @Before
     fun setUp() {
+        hiltRule.inject()
         Intents.init()
     }
 
@@ -48,19 +94,20 @@ class AuthenticationActivityTest {
         assertEquals("ch.sdp.vibester", appContext.packageName)
     }
 
-    @get:Rule
-    val testRule = ActivityScenarioRule(
-        AuthenticationActivity::class.java
-    )
+
 
     @Test
     fun logInIncorrect() {
         val username = "johnyyy@test.com"
         val password = "password"
+
+        val mockTask = createMockTask(false)
+        every { mockAuthenticator.signIn(username, password) } returns mockTask
+
         onView(withId(R.id.username)).perform(ViewActions.typeText(username), closeSoftKeyboard())
         onView(withId(R.id.password)).perform(ViewActions.typeText(password), closeSoftKeyboard())
         onView(withId(R.id.logIn)).perform(click())
-        Thread.sleep(sleepTime)
+        Thread.sleep(1000)
         onView(withId(R.id.email)).check(matches(withText("Authentication error")))
     }
 
@@ -68,11 +115,17 @@ class AuthenticationActivityTest {
     fun createAccountIncorrect() {
         val username = "john@test.com"
         val password = "password"
+
+        val mockTask = createMockTask(false)
+        every { mockAuthenticator.createAccount(username, password) } returns mockTask
+
         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())
-        Thread.sleep(sleepTime)
+
         onView(withId(R.id.email)).check(matches(withText("Authentication error")))
+
+
     }
 
     @Test
@@ -91,9 +144,11 @@ class AuthenticationActivityTest {
     fun stringValidationWrongEmail() {
         val username = "john"
         val password = "password"
+
         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())
+
         onView(withId(R.id.email)).check(matches(withText("Not an email")))
     }
 
@@ -101,47 +156,64 @@ class AuthenticationActivityTest {
     fun stringValidationShorPassword() {
         val username = "john@test.com"
         val password = "12345"
+
         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())
+
         onView(withId(R.id.email)).check(matches(withText("Password has to be at least 6 symbols")))
     }
 
     @Test
     fun derinTest() {
         val a = FireBaseAuthenticator()
+
         a.googleActivityResult(-1, -1, null)
+
         onView(withId(R.id.email)).check(matches(withText("TextView")))
     }
 
     @Test
     fun ardaTest() {
         val a = FireBaseAuthenticator()
+
         a.googleActivityResult(1000, -1, null)
+
         onView(withId(R.id.email)).check(matches(withText("TextView")))
     }
 
     @Test
     fun logInCorrect() {
-        val username = "lisa@test.com"
+        val username = "mockUsername@test.com"
         val password = "password"
+
+        val mockTask = createMockTask(true)
+        val mockUser = createMockUser(username)
+        every { mockAuthenticator.signIn(username, password) } returns mockTask
+        every { mockAuthenticator.getCurrUser()} returns mockUser
+
         onView(withId(R.id.username)).perform(ViewActions.typeText(username), closeSoftKeyboard())
         onView(withId(R.id.password)).perform(ViewActions.typeText(password), closeSoftKeyboard())
         onView(withId(R.id.logIn)).perform(click())
-        Thread.sleep(sleepTime)
+
         Intents.intended(IntentMatchers.hasComponent(ProfileActivity::class.java.name))
         Intents.intended(IntentMatchers.hasExtra("email", username))
     }
 
     @Test
     fun createAccountCorrect() {
-        val randomInt = Random.nextInt(0, 10000)
+        val username = "user@user.com"
         val password = "password"
-        val username = randomInt.toString().plus("@gg.com")
+
+        val mockTask = createMockTask(true)
+        val mockUser = createMockUser(username)
+        every { mockAuthenticator.createAccount(username, password) } returns mockTask
+        every { mockAuthenticator.getCurrUser()} returns mockUser
+
         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())
-        Thread.sleep(sleepTime)
+
         Intents.intended(IntentMatchers.hasComponent(ProfileActivity::class.java.name))
         Intents.intended(IntentMatchers.hasExtra("email", username))
     }
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 f97423dad..22f002e79 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
@@ -7,26 +7,48 @@ 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.espresso.matcher.ViewMatchers.* //change this import
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
+import ch.sdp.vibester.database.UsersRepo
 import ch.sdp.vibester.profile.UserProfile
+import dagger.hilt.android.testing.BindValue
+import dagger.hilt.android.testing.HiltAndroidRule
+import dagger.hilt.android.testing.HiltAndroidTest
+import io.mockk.every
+import io.mockk.mockk
 import org.junit.After
 import org.junit.Before
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
 
 @RunWith(AndroidJUnit4::class)
+@HiltAndroidTest
 class ProfileActivityTest {
 
     private val sleepTime: Long = 4000
 
+    @get:Rule(order = 0)
+    var hiltRule = HiltAndroidRule(this)
+
     @Before
     fun setUp() {
+        hiltRule.inject()
         Intents.init()
     }
 
+    @BindValue @JvmField
+    val mockUsersRepo = mockk<UsersRepo>()
+
+    private fun createMockInvocation(mockProfile: UserProfile) {
+        every { mockUsersRepo.getUserData(any(), any()) } answers {
+            secondArg<(UserProfile) -> Unit>().invoke(mockProfile)
+        }
+        every { mockUsersRepo.updateField(any(), any(), any()) } answers {}
+    }
+
     @After
     fun clean() {
         Intents.release()
@@ -37,13 +59,14 @@ class ProfileActivityTest {
         val inputProfile = UserProfile("@lisa", "Lalisa Bon","bit.ly/3IUnyAF", "lisa@test.com",  12, 8, 29, 0)
         val intent = Intent(ApplicationProvider.getApplicationContext(), ProfileActivity::class.java)
         intent.putExtra("email", inputProfile.email)
-        intent.putExtra("userProfile", inputProfile)
+
+        createMockInvocation(inputProfile)
+
         val scn: ActivityScenario<ProfileActivity> = ActivityScenario.launch(intent)
-        Thread.sleep(sleepTime)
+
         onView(withId(R.id.handle)).check(matches(withText(inputProfile.handle)))
         onView(withId(R.id.username)).check(matches(withText(inputProfile.username)))
-        //FIXME the data has changed in the database, thus the test is failing
-//        onView(withId(R.id.correctSongs)).check(matches(withText(inputProfile.correctSongs.toString())))
+        onView(withId(R.id.correctSongs)).check(matches(withText(inputProfile.correctSongs.toString())))
         onView(withId(R.id.totalGames)).check(matches(withText(inputProfile.totalGames.toString())))
         onView(withId(R.id.ranking)).check(matches(withText(inputProfile.ranking.toString())))
     }
@@ -53,11 +76,15 @@ class ProfileActivityTest {
         val inputProfile = UserProfile("@lisa", "Lalisa Bon","bit.ly/3IUnyAF", "lisa@test.com",  12, 8, 29, 0)
         val intent = Intent(ApplicationProvider.getApplicationContext(), ProfileActivity::class.java)
         intent.putExtra("email", inputProfile.email)
+
+        createMockInvocation(inputProfile)
+
         val scn: ActivityScenario<ProfileActivity> = ActivityScenario.launch(intent)
-        Thread.sleep(sleepTime)
+
         onView(withId(R.id.profileStatistics)).check(matches(isDisplayed()))
         onView(withId(R.id.handle)).check(matches(isDisplayed()))
         onView(withId(R.id.username)).check(matches(isDisplayed()))
+        //TODO not sure why but this tests fails on CI but passes locally
 //        onView(withId(R.id.avatar)).check(matches(isDisplayed()))
     }
 
@@ -66,9 +93,12 @@ class ProfileActivityTest {
         val inputProfile = UserProfile("@lisa", "Lalisa Bon","bit.ly/3IUnyAF", "lisa@test.com",  12, 8, 29, 0)
         val intent = Intent(ApplicationProvider.getApplicationContext(), ProfileActivity::class.java)
         intent.putExtra("email", inputProfile.email)
+
+        createMockInvocation(inputProfile)
+
         val scn: ActivityScenario<ProfileActivity> = ActivityScenario.launch(intent)
 
-        val newUsername = "Lalisa Bon"
+        val newUsername = "Lalisa Bon idomesniu"
         onView(withId(R.id.editUser)).perform(ViewActions.click())
         onView(withId(0)).perform(
             ViewActions.typeText(newUsername),
@@ -84,8 +114,11 @@ class ProfileActivityTest {
         val inputProfile = UserProfile("@lisa", "Lalisa Bon","bit.ly/3IUnyAF", "lisa@test.com",  12, 8, 29, 0)
         val intent = Intent(ApplicationProvider.getApplicationContext(), ProfileActivity::class.java)
         intent.putExtra("email", inputProfile.email)
+
+        createMockInvocation(inputProfile)
+
         val scn: ActivityScenario<ProfileActivity> = ActivityScenario.launch(intent)
-        Thread.sleep(sleepTime)
+
         onView(withId(R.id.editUser)).perform(ViewActions.click())
         onView(withText("Cancel")).perform(ViewActions.click())
         onView(withId(R.id.username)).check(matches(withText("Lalisa Bon")))
@@ -96,8 +129,11 @@ class ProfileActivityTest {
         val inputProfile = UserProfile("@lisa", "Lalisa Bon","bit.ly/3IUnyAF", "lisa@test.com",  12, 8, 29, 0)
         val intent = Intent(ApplicationProvider.getApplicationContext(), ProfileActivity::class.java)
         intent.putExtra("email", inputProfile.email)
+
+        createMockInvocation(inputProfile)
+
         val scn: ActivityScenario<ProfileActivity> = ActivityScenario.launch(intent)
-        Thread.sleep(sleepTime)
+
         val newUserHandle = "@lisa"
         onView(withId(R.id.editHandle)).perform(ViewActions.click())
         onView(withId(0)).perform(
@@ -114,8 +150,11 @@ class ProfileActivityTest {
         val inputProfile = UserProfile("@lisa", "Lalisa Bon","bit.ly/3IUnyAF", "lisa@test.com",  12, 8, 29, 0)
         val intent = Intent(ApplicationProvider.getApplicationContext(), ProfileActivity::class.java)
         intent.putExtra("email", inputProfile.email)
+
+        createMockInvocation(inputProfile)
+
         val scn: ActivityScenario<ProfileActivity> = ActivityScenario.launch(intent)
-        Thread.sleep(sleepTime)
+
         onView(withId(R.id.editHandle)).perform(ViewActions.click())
         onView(withText("Cancel")).perform(ViewActions.click())
         onView(withId(R.id.handle)).check(matches(withText("@lisa")))
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 5d5d14ff8..796e558bb 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt
@@ -9,16 +9,25 @@ 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 dagger.hilt.android.testing.HiltAndroidRule
+import dagger.hilt.android.testing.HiltAndroidTest
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
+@HiltAndroidTest
 @RunWith(AndroidJUnit4::class)
 class WelcomeActivityTest {
-    @get: Rule
-    val activityRule = ActivityScenarioRule(WelcomeActivity::class.java)
+    @get:Rule(order = 0)
+    var hiltRule = HiltAndroidRule(this)
+
+
+    @get:Rule(order = 1)
+    val testRule = ActivityScenarioRule(
+        WelcomeActivity::class.java
+    )
 
     @Before
     fun setUp() {
diff --git a/app/src/androidTest/java/ch/sdp/vibester/profile/ProfileDataProviderTest.kt b/app/src/androidTest/java/ch/sdp/vibester/profile/ProfileDataProviderTest.kt
deleted file mode 100644
index 1f1ac6d44..000000000
--- a/app/src/androidTest/java/ch/sdp/vibester/profile/ProfileDataProviderTest.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package ch.sdp.vibester.profile
-
-//import ch.sdp.vibester.profile.ProfileDataProvider
-
-
-class ProfileDataProviderTest {
-
-//    @Test
-//    fun checkGetUserData(){
-//        val userID = 0
-//        val users: List<UserProfile> = listOf(
-//            UserProfile("user0", "username0","https://bit.ly/3tO0k8W",  5, 8, 34),
-//            UserProfile("user1", "username1", "https://bit.ly/3sZhbXm", 5, 8, 34)
-//        )
-//        val scoreboard: List<Int> = listOf(1,2,3,4,5,6)
-//        val dataProvider = ProfileDataProvider(userID.toString(), users, scoreboard)
-//        val finalUser = dataProvider.getUserProfileData()
-//
-//        // To change on recursive equality of objects
-//        Assert.assertEquals(finalUser.handle, users[userID].handle)
-//        Assert.assertEquals(finalUser.username, users[userID].username)
-//        Assert.assertEquals(finalUser.image, users[userID].image)
-//        Assert.assertEquals(finalUser.bestScore, users[userID].bestScore)
-//        Assert.assertEquals(finalUser.totalGames, users[userID].totalGames)
-//        Assert.assertEquals(finalUser.correctSongs, users[userID].correctSongs)
-//        Assert.assertEquals(finalUser.ranking, scoreboard[userID])
-//    }
-
-
-}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2a466cc87..b984e5dad 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,12 +9,14 @@
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
 
     <application
+        android:name=".VibesterApp"
         android:allowBackup="true"
         android:icon="@drawable/logo"
         android:label="@string/app_name"
         android:roundIcon="@drawable/logo"
         android:supportsRtl="true"
         android:theme="@style/Theme.MyApplication"
+        android:extractNativeLibs="true"
         android:usesCleartextTraffic="true">
         <activity
             android:name=".activity.BuzzerSetupActivity"
diff --git a/app/src/main/java/ch/sdp/vibester/VibesterApp.kt b/app/src/main/java/ch/sdp/vibester/VibesterApp.kt
new file mode 100644
index 000000000..26d48c638
--- /dev/null
+++ b/app/src/main/java/ch/sdp/vibester/VibesterApp.kt
@@ -0,0 +1,8 @@
+package ch.sdp.vibester
+
+import android.app.Application
+import dagger.hilt.android.HiltAndroidApp
+
+@HiltAndroidApp
+class VibesterApp : Application() {
+}
\ 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 2ce879fdb..364dc4957 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
@@ -15,16 +15,20 @@ import com.google.android.gms.auth.api.signin.GoogleSignInClient
 import com.google.android.gms.auth.api.signin.GoogleSignInOptions
 import com.google.android.gms.tasks.Task
 import com.google.firebase.auth.AuthResult
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
 
+
+@AndroidEntryPoint
 class AuthenticationActivity : AppCompatActivity() {
 
     private lateinit var googleSignInClient: GoogleSignInClient
 
-    private lateinit var authenticator: FireBaseAuthenticator
+    @Inject
+    lateinit var authenticator: FireBaseAuthenticator
 
     private lateinit var email: TextView
 
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         requestWindowFeature(Window.FEATURE_NO_TITLE)
@@ -36,7 +40,6 @@ class AuthenticationActivity : AppCompatActivity() {
             .build()
 
         googleSignInClient = GoogleSignIn.getClient(this, gso)
-        authenticator = FireBaseAuthenticator()
 
         val btCreateAcc = findViewById<Button>(R.id.createAcc)
         val btLogIn = findViewById<Button>(R.id.logIn)
@@ -61,10 +64,6 @@ class AuthenticationActivity : AppCompatActivity() {
 
     public override fun onStart() {
         super.onStart()
-        val currentUser = authenticator.auth.currentUser
-        if (currentUser != null) {
-            reload()
-        }
     }
 
     /**
@@ -102,9 +101,9 @@ class AuthenticationActivity : AppCompatActivity() {
         return true
     }
 
-    private fun authenticate(email: String, password: String, creatAcc: Boolean) {
+    private fun authenticate(email: String, password: String, createAcc: Boolean) {
         if (stringValidation(email, password)) {
-            var auth: Task<AuthResult> = if (creatAcc) {
+            var auth: Task<AuthResult> = if (createAcc) {
                 authenticator.createAccount(email, password)
             }else {
                 authenticator.signIn(email, password)
@@ -133,7 +132,7 @@ class AuthenticationActivity : AppCompatActivity() {
                 baseContext, "You have logged in successfully",
                 Toast.LENGTH_SHORT
             ).show()
-            val user = authenticator.auth.currentUser
+            val user = authenticator.getCurrUser()
             if (user != null) {
                 updateUI(user.email)
             }
@@ -146,10 +145,6 @@ class AuthenticationActivity : AppCompatActivity() {
         }
     }
 
-    private fun reload() {
-
-    }
-
     private fun updateUI(emailText: String?) {
         if (emailText != null) {
             if('@' in emailText) {
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 cddeb82df..f78cdebf0 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
@@ -1,32 +1,24 @@
 package ch.sdp.vibester.activity
 
-import android.content.ContentValues.TAG
-import android.content.DialogInterface
 import android.os.Bundle
 import android.text.InputType
-import android.util.Log
 import android.view.Window
 import android.widget.Button
 import android.widget.EditText
-import android.widget.ImageView
 import android.widget.TextView
 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.database.UsersRepo
 import ch.sdp.vibester.profile.UserProfile
-import com.google.firebase.database.*
-import com.google.firebase.ktx.Firebase
-import com.google.firebase.database.ktx.database
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.launch
-import java.util.*
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
 
+@AndroidEntryPoint
 class ProfileActivity : AppCompatActivity() {
-    private var database: FirebaseDatabase = Firebase.database("https://vibester-sdp-default-rtdb.europe-west1.firebasedatabase.app")
-    private lateinit var databaseRef: DatabaseReference
+
+    @Inject
+    lateinit var usersRepo: UsersRepo
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -49,8 +41,6 @@ class ProfileActivity : AppCompatActivity() {
         editHandle.setOnClickListener {
             showGeneralDialog(R.id.handle, "handle")
         }
-
-        databaseRef = database.reference
     }
 
     /**
@@ -72,13 +62,10 @@ class ProfileActivity : AppCompatActivity() {
         input.id = id
 
         builder.setView(input)
-        builder.setPositiveButton("OK", DialogInterface.OnClickListener { _, _ ->
+        builder.setPositiveButton("OK") { _, _ ->
             findViewById<TextView>(textId).text = input.text.toString()
-            databaseRef.child("users")
-                .child("-Myfy9TlCUTWYRxVLBsQ") //For now ID is hardcoded, will generate it creating new users next week
-                .child(name)
-                .setValue(input.text.toString())
-        })
+            usersRepo.updateField("-Myfy9TlCUTWYRxVLBsQ", input.text.toString() ,name)
+        }
         builder.setNegativeButton("Cancel") { dialog, _ -> dialog.cancel() }
         builder.show()
     }
@@ -99,35 +86,7 @@ class ProfileActivity : AppCompatActivity() {
      */
 
     private fun queryDatabase(email: String) {
-        var user: UserProfile
-        val userRef = database.getReference("users")
-        userRef.addValueEventListener(object : ValueEventListener {
-            override fun onDataChange(dataSnapshot: DataSnapshot) {
-                for (dataSnapShot in dataSnapshot.children) {
-                    val dbContents: Map<String, Objects> = dataSnapShot.value as Map<String, Objects>
-                    if(dbContents["email"].toString() == email) {
-                        user = UserProfile(
-                            dbContents["handle"].toString(),
-                            dbContents["username"].toString(),
-                            dbContents["image"].toString(),
-                            dbContents["email"].toString(),
-                            dbContents["totalGames"].toString().toInt(),
-                            dbContents["bestScore"].toString().toInt(),
-                            dbContents["correctSongs"].toString().toInt()
-                        )
-                        setupProfile(user)
-                        break
-                    }
-                    else {
-                        setupProfile(UserProfile())
-                    }
-                }
-            }
-
-            override fun onCancelled(databaseError: DatabaseError) {
-                Log.w(TAG, "loadUsers:onCancelled", databaseError.toException())
-            }
-        })
+        usersRepo.getUserData(email, this::setupProfile)
     }
 
 
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 c59f1bb3a..19cf70097 100644
--- a/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
+++ b/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
@@ -6,17 +6,20 @@ 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.ktx.auth
 import com.google.firebase.ktx.Firebase
+import dagger.hilt.android.scopes.ServiceScoped
+import javax.inject.Inject
 
-class FireBaseAuthenticator() {
+class FireBaseAuthenticator @Inject constructor() {
 
-    val auth: FirebaseAuth = Firebase.auth
+    private val auth: FirebaseAuth = Firebase.auth
 
     /**
      * A function to log in with email and password
      * @param email email
-     * @param password passwprd
+     * @param password password
      * @return Task of the result
      */
     fun signIn(email: String, password: String): Task<AuthResult> {
@@ -34,6 +37,10 @@ class FireBaseAuthenticator() {
         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
diff --git a/app/src/main/java/ch/sdp/vibester/database/Database.kt b/app/src/main/java/ch/sdp/vibester/database/Database.kt
new file mode 100644
index 000000000..872dc745e
--- /dev/null
+++ b/app/src/main/java/ch/sdp/vibester/database/Database.kt
@@ -0,0 +1,15 @@
+package ch.sdp.vibester.database
+
+import com.google.firebase.database.FirebaseDatabase
+import com.google.firebase.database.ktx.database
+import com.google.firebase.ktx.Firebase
+
+/**
+ * The Database objects that returns our databse instance
+ */
+
+object Database {
+    fun get(): FirebaseDatabase {
+        return Firebase.database("https://vibester-sdp-default-rtdb.europe-west1.firebasedatabase.app")
+    }
+}
\ 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/UsersRepo.kt
new file mode 100644
index 000000000..1ddc259ca
--- /dev/null
+++ b/app/src/main/java/ch/sdp/vibester/database/UsersRepo.kt
@@ -0,0 +1,57 @@
+package ch.sdp.vibester.database
+
+import android.content.ContentValues
+import android.util.Log
+import ch.sdp.vibester.profile.UserProfile
+import com.google.firebase.database.DataSnapshot
+import com.google.firebase.database.DatabaseError
+import com.google.firebase.database.ValueEventListener
+import com.google.firebase.database.ktx.getValue
+import javax.inject.Inject
+
+/**
+ * The users class which handled all the interactions with the database that are linked to users
+ */
+
+class UsersRepo @Inject constructor() {
+    private val dbRef = Database.get().getReference("users")
+
+
+    /**
+     * The users class which handled all the interactions with the database that are linked to users
+     * @param userID the id of the user which is being updated
+     * @param newVal the new value of the field that is being updated
+     * @param fieldName the field name of the field that is being updated
+     */
+    fun updateField(userID: String, newVal: String, fieldName: String) {
+        dbRef.child(userID) //For now ID is hardcoded, will generate it creating new users next week "-Myfy9TlCUTWYRxVLBsQ"
+            .child(fieldName)
+            .setValue(newVal)
+    }
+
+    /**
+     * The users class which handled all the interactions with the database that are linked to users
+     * @param email the of the user
+     * @param callback the callback function to be called when the data of the appropriate user is available
+     */
+    fun getUserData(email: String, callback: (UserProfile) -> Unit) {
+        dbRef.addValueEventListener(object : ValueEventListener {
+            override fun onDataChange(dataSnapshot: DataSnapshot) {
+                for (dataSnapShot in dataSnapshot.children) {
+                    val dbContents = dataSnapShot.getValue<UserProfile>()
+                    if (dbContents != null) {
+                        if(dbContents.email == email) {
+                            callback(dbContents)
+                            break
+                        } else {
+                            callback(UserProfile())
+                        }
+                    }
+                }
+            }
+            override fun onCancelled(databaseError: DatabaseError) {
+                Log.w(ContentValues.TAG, "loadUsers:onCancelled", databaseError.toException())
+            }
+        })
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 00b8ea155..237dc90dd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -30,7 +30,6 @@
     <string name="emptyField">Empty email or password</string>
     <string name="notAnEmail">Not an email</string>
     <string name="shortPassword">Password has to be at least 6 symbols</string>
-    Password has to be at least 6 symbols
 
     <string name="game_end__player_name">Player Name Here</string>
     <string name="game_end__show_stats">Here are your stats!</string>
diff --git a/build.gradle b/build.gradle
index 675d91e9b..3a46f2b2e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,6 +7,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.google.gms:google-services:4.3.10'
+        classpath 'com.google.dagger:hilt-android-gradle-plugin:2.38.1'
     }
 }
 plugins {