diff --git a/.run/Run tests.run.xml b/.run/Run tests.run.xml
new file mode 100644
index 0000000..fc738b6
--- /dev/null
+++ b/.run/Run tests.run.xml	
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+	<configuration name="Run tests" default="false" factoryName="Gradle"
+		type="GradleRunConfiguration">
+		<ExternalSystemSettings>
+			<option name="executionName" />
+			<option name="externalProjectPath" value="$PROJECT_DIR$" />
+			<option name="externalSystemIdString" value="GRADLE" />
+			<option name="scriptParameters" value="" />
+			<option name="taskDescriptions">
+				<list />
+			</option>
+			<option name="taskNames">
+				<list>
+					<option value="testDebugUnitTest" />
+				</list>
+			</option>
+			<option name="vmOptions" />
+		</ExternalSystemSettings>
+		<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
+		<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+		<DebugAllEnabled>false</DebugAllEnabled>
+		<method v="2" />
+	</configuration>
+</component>
\ No newline at end of file
diff --git a/app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthDataSourceImpl.kt b/app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthDataSourceImpl.kt
index 5721c80..7cadcc0 100644
--- a/app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthDataSourceImpl.kt
+++ b/app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthDataSourceImpl.kt
@@ -2,13 +2,11 @@ package gq.kirmanak.mealient.data.auth.impl
 
 import gq.kirmanak.mealient.data.auth.AuthDataSource
 import gq.kirmanak.mealient.datasource.MealieDataSource
-import gq.kirmanak.mealient.logging.Logger
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class AuthDataSourceImpl @Inject constructor(
-    private val logger: Logger,
     private val mealieDataSource: MealieDataSource,
 ) : AuthDataSource {
 
diff --git a/app/src/test/java/gq/kirmanak/mealient/data/add/impl/AddRecipeDataSourceImplTest.kt b/app/src/test/java/gq/kirmanak/mealient/data/add/impl/AddRecipeDataSourceImplTest.kt
deleted file mode 100644
index f58334e..0000000
--- a/app/src/test/java/gq/kirmanak/mealient/data/add/impl/AddRecipeDataSourceImplTest.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package gq.kirmanak.mealient.data.add.impl
-
-import com.google.common.truth.Truth.assertThat
-import gq.kirmanak.mealient.data.add.models.AddRecipeRequest
-import gq.kirmanak.mealient.data.network.NetworkError
-import gq.kirmanak.mealient.data.network.ServiceFactory
-import gq.kirmanak.mealient.logging.Logger
-import io.mockk.MockKAnnotations
-import io.mockk.coEvery
-import io.mockk.impl.annotations.MockK
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.test.runTest
-import kotlinx.serialization.SerializationException
-import org.junit.Before
-import org.junit.Test
-
-@OptIn(ExperimentalCoroutinesApi::class)
-class AddRecipeDataSourceImplTest {
-
-    @MockK
-    lateinit var serviceProvider: ServiceFactory<AddRecipeService>
-
-    @MockK
-    lateinit var service: AddRecipeService
-
-    @MockK(relaxUnitFun = true)
-    lateinit var logger: Logger
-
-    lateinit var subject: AddRecipeDataSourceImpl
-
-    @Before
-    fun setUp() {
-        MockKAnnotations.init(this)
-        coEvery { serviceProvider.provideService(any()) } returns service
-        subject = AddRecipeDataSourceImpl(serviceProvider, logger)
-    }
-
-    @Test(expected = NetworkError.NotMealie::class)
-    fun `when addRecipe fails then maps error`() = runTest {
-        coEvery { service.addRecipe(any()) } throws SerializationException()
-        subject.addRecipe(AddRecipeRequest())
-    }
-
-    @Test
-    fun `when addRecipe succeeds then returns response`() = runTest {
-        coEvery { service.addRecipe(any()) } returns "response"
-        assertThat(subject.addRecipe(AddRecipeRequest())).isEqualTo("response")
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/gq/kirmanak/mealient/data/add/models/AddRecipeRequestTest.kt b/app/src/test/java/gq/kirmanak/mealient/extensions/RemoteToLocalMappingsTest.kt
similarity index 82%
rename from app/src/test/java/gq/kirmanak/mealient/data/add/models/AddRecipeRequestTest.kt
rename to app/src/test/java/gq/kirmanak/mealient/extensions/RemoteToLocalMappingsTest.kt
index 78ab001..56b8428 100644
--- a/app/src/test/java/gq/kirmanak/mealient/data/add/models/AddRecipeRequestTest.kt
+++ b/app/src/test/java/gq/kirmanak/mealient/extensions/RemoteToLocalMappingsTest.kt
@@ -1,13 +1,17 @@
-package gq.kirmanak.mealient.data.add.models
+package gq.kirmanak.mealient.extensions
 
 import com.google.common.truth.Truth.assertThat
+import gq.kirmanak.mealient.datasource.models.AddRecipeIngredient
+import gq.kirmanak.mealient.datasource.models.AddRecipeInstruction
+import gq.kirmanak.mealient.datasource.models.AddRecipeRequest
+import gq.kirmanak.mealient.datasource.models.AddRecipeSettings
 import gq.kirmanak.mealient.datastore.recipe.AddRecipeDraft
 import org.junit.Test
 
-class AddRecipeRequestTest {
+class RemoteToLocalMappingsTest {
 
     @Test
-    fun `when construct from input then fills fields correctly`() {
+    fun `when toAddRecipeRequest then fills fields correctly`() {
         val input = AddRecipeDraft(
             recipeName = "Recipe name",
             recipeDescription = "Recipe description",
@@ -36,11 +40,11 @@ class AddRecipeRequestTest {
             )
         )
 
-        assertThat(AddRecipeRequest(input)).isEqualTo(expected)
+        assertThat(input.toAddRecipeRequest()).isEqualTo(expected)
     }
 
     @Test
-    fun `when toInput then fills fields correctly`() {
+    fun `when toDraft then fills fields correctly`() {
         val request = AddRecipeRequest(
             name = "Recipe name",
             description = "Recipe description",