diff --git a/app/build.gradle b/app/build.gradle
index 91fcfdb4..2ab5241c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,11 +21,11 @@ plugins {
 }
 
 android {
-    compileSdkVersion 32
+    compileSdk 33
     defaultConfig {
         applicationId "com.example.android.dagger"
         minSdkVersion 14
-        targetSdkVersion 32
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "com.example.android.dagger.MyCustomTestRunner"
@@ -36,15 +36,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-    sourceSets {
-        String sharedTestDir = 'src/sharedTest/java'
-        test {
-            java.srcDir sharedTestDir
-        }
-        androidTest {
-            java.srcDir sharedTestDir
-        }
-    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -65,6 +57,9 @@ dependencies {
     implementation "com.google.dagger:dagger:$dagger_version"
     kapt "com.google.dagger:dagger-compiler:$dagger_version"
 
+    testImplementation project(path: ':shared-test')
+    androidTestImplementation project(path: ':shared-test')
+
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-core:3.4.6'
     testImplementation 'android.arch.core:core-testing:1.1.1'
diff --git a/app/src/androidTest/java/com/example/android/dagger/di/TestStorageModule.kt b/app/src/androidTest/java/com/example/android/dagger/di/TestStorageModule.kt
index efe69fea..0181eb44 100644
--- a/app/src/androidTest/java/com/example/android/dagger/di/TestStorageModule.kt
+++ b/app/src/androidTest/java/com/example/android/dagger/di/TestStorageModule.kt
@@ -16,7 +16,7 @@
 
 package com.example.android.dagger.di
 
-import com.example.android.dagger.storage.FakeStorage
+import com.example.android.dagger.shared_test.storage.FakeStorage
 import com.example.android.dagger.storage.Storage
 import dagger.Binds
 import dagger.Module
diff --git a/app/src/test/java/com/example/android/dagger/login/LoginViewModelTest.kt b/app/src/test/java/com/example/android/dagger/login/LoginViewModelTest.kt
index 4d539c14..2395695b 100644
--- a/app/src/test/java/com/example/android/dagger/login/LoginViewModelTest.kt
+++ b/app/src/test/java/com/example/android/dagger/login/LoginViewModelTest.kt
@@ -17,7 +17,7 @@
 package com.example.android.dagger.login
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
-import com.example.android.dagger.LiveDataTestUtil
+import com.example.android.dagger.shared_test.LiveDataTestUtil
 import com.example.android.dagger.user.UserManager
 import org.junit.Assert.assertEquals
 import org.junit.Before
diff --git a/app/src/test/java/com/example/android/dagger/registration/enterdetails/EnterDetailsViewModelTest.kt b/app/src/test/java/com/example/android/dagger/registration/enterdetails/EnterDetailsViewModelTest.kt
index eeff78be..2ccc4d55 100644
--- a/app/src/test/java/com/example/android/dagger/registration/enterdetails/EnterDetailsViewModelTest.kt
+++ b/app/src/test/java/com/example/android/dagger/registration/enterdetails/EnterDetailsViewModelTest.kt
@@ -17,7 +17,7 @@
 package com.example.android.dagger.registration.enterdetails
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
-import com.example.android.dagger.LiveDataTestUtil
+import com.example.android.dagger.shared_test.LiveDataTestUtil
 import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Rule
diff --git a/app/src/test/java/com/example/android/dagger/storage/UserManagerTest.kt b/app/src/test/java/com/example/android/dagger/storage/UserManagerTest.kt
index 8fe52aad..08752bfc 100644
--- a/app/src/test/java/com/example/android/dagger/storage/UserManagerTest.kt
+++ b/app/src/test/java/com/example/android/dagger/storage/UserManagerTest.kt
@@ -16,6 +16,7 @@
 
 package com.example.android.dagger.storage
 
+import com.example.android.dagger.shared_test.storage.FakeStorage
 import com.example.android.dagger.user.UserComponent
 import com.example.android.dagger.user.UserManager
 import org.junit.Assert.assertEquals
diff --git a/settings.gradle b/settings.gradle
index e7b4def4..281070af 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,2 @@
 include ':app'
+include ':shared-test'
diff --git a/shared-test/.gitignore b/shared-test/.gitignore
new file mode 100644
index 00000000..42afabfd
--- /dev/null
+++ b/shared-test/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/shared-test/build.gradle b/shared-test/build.gradle
new file mode 100644
index 00000000..8f2c5af9
--- /dev/null
+++ b/shared-test/build.gradle
@@ -0,0 +1,48 @@
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+    id 'kotlin-kapt'
+}
+
+android {
+    namespace 'com.example.android.dagger.shared_test'
+    compileSdk 33
+
+    defaultConfig {
+        minSdk 14
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+}
+
+dependencies {
+
+    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation project(path: ':app')
+
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+
+    def dagger_version = "2.48.1"
+    implementation "com.google.dagger:dagger:$dagger_version"
+    kapt "com.google.dagger:dagger-compiler:$dagger_version"
+    kaptAndroidTest "com.google.dagger:dagger-compiler:$dagger_version"
+}
\ No newline at end of file
diff --git a/shared-test/consumer-rules.pro b/shared-test/consumer-rules.pro
new file mode 100644
index 00000000..e69de29b
diff --git a/shared-test/proguard-rules.pro b/shared-test/proguard-rules.pro
new file mode 100644
index 00000000..481bb434
--- /dev/null
+++ b/shared-test/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/shared-test/src/androidTest/java/com/example/android/dagger/shared_test/ExampleInstrumentedTest.kt b/shared-test/src/androidTest/java/com/example/android/dagger/shared_test/ExampleInstrumentedTest.kt
new file mode 100644
index 00000000..7c1954e2
--- /dev/null
+++ b/shared-test/src/androidTest/java/com/example/android/dagger/shared_test/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package com.example.android.dagger.shared_test
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.example.android.dagger.shared_test.test", appContext.packageName)
+    }
+}
\ No newline at end of file
diff --git a/shared-test/src/main/AndroidManifest.xml b/shared-test/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..a5918e68
--- /dev/null
+++ b/shared-test/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>
\ No newline at end of file
diff --git a/app/src/sharedTest/java/com/example/android/dagger/LiveDataTestUtil.kt b/shared-test/src/main/java/com/example/android/dagger/shared_test/LiveDataTestUtil.kt
similarity index 96%
rename from app/src/sharedTest/java/com/example/android/dagger/LiveDataTestUtil.kt
rename to shared-test/src/main/java/com/example/android/dagger/shared_test/LiveDataTestUtil.kt
index a37ba112..fce616ae 100644
--- a/app/src/sharedTest/java/com/example/android/dagger/LiveDataTestUtil.kt
+++ b/shared-test/src/main/java/com/example/android/dagger/shared_test/LiveDataTestUtil.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.example.android.dagger
+package com.example.android.dagger.shared_test
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Observer
diff --git a/app/src/sharedTest/java/com/example/android/dagger/storage/FakeStorage.kt b/shared-test/src/main/java/com/example/android/dagger/shared_test/storage/FakeStorage.kt
similarity index 89%
rename from app/src/sharedTest/java/com/example/android/dagger/storage/FakeStorage.kt
rename to shared-test/src/main/java/com/example/android/dagger/shared_test/storage/FakeStorage.kt
index e102abf8..2ff88c5d 100644
--- a/app/src/sharedTest/java/com/example/android/dagger/storage/FakeStorage.kt
+++ b/shared-test/src/main/java/com/example/android/dagger/shared_test/storage/FakeStorage.kt
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-package com.example.android.dagger.storage
+package com.example.android.dagger.shared_test.storage
 
+import com.example.android.dagger.storage.Storage
 import javax.inject.Inject
 
 class FakeStorage @Inject constructor(): Storage {
diff --git a/shared-test/src/test/java/com/example/android/dagger/shared_test/ExampleUnitTest.kt b/shared-test/src/test/java/com/example/android/dagger/shared_test/ExampleUnitTest.kt
new file mode 100644
index 00000000..cc318169
--- /dev/null
+++ b/shared-test/src/test/java/com/example/android/dagger/shared_test/ExampleUnitTest.kt
@@ -0,0 +1,17 @@
+package com.example.android.dagger.shared_test
+
+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 ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
\ No newline at end of file