diff --git a/app/src/test/java/com/juandgaines/testground/data/UserRepositoryTest.kt b/app/src/test/java/com/juandgaines/testground/data/UserRepositoryTest.kt
index c705175..522e667 100644
--- a/app/src/test/java/com/juandgaines/testground/data/UserRepositoryTest.kt
+++ b/app/src/test/java/com/juandgaines/testground/data/UserRepositoryTest.kt
@@ -1,31 +1,16 @@
 package com.juandgaines.testground.data
 
 import com.google.common.truth.Truth
-import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
-import com.juandgaines.testground.domain.Coordinates
-import com.juandgaines.testground.domain.Place
-import com.juandgaines.testground.domain.User
-import com.juandgaines.testground.util.MainDispatcherRule
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
-import kotlinx.serialization.json.Json
-import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.mockwebserver.MockResponse
-import okhttp3.mockwebserver.MockWebServer
-import org.junit.After
 import org.junit.Before
-import org.junit.Rule
 import org.junit.Test
-import retrofit2.HttpException
-import retrofit2.Retrofit
 
 @OptIn(ExperimentalCoroutinesApi::class)
 class UserRepositoryTest {
 
     private lateinit var repository: UserRepositoryImpl
     private lateinit var api: UserApiFake
-    private lateinit var mockWebServer: MockWebServer
-    private lateinit var mockApi: UserApi
 
     @Before
     fun setUp() {
@@ -33,21 +18,10 @@ class UserRepositoryTest {
         api = UserApiFake()
         repository = UserRepositoryImpl(api)
 
-        // Setup for MockWebServer tests
-        val contentType = "application/json".toMediaType()
-        mockWebServer = MockWebServer()
-        mockApi = Retrofit.Builder()
-            .baseUrl(mockWebServer.url("/"))
-            .addConverterFactory(Json.asConverterFactory(contentType))
-            .build()
-            .create(UserApi::class.java)
-    }
 
-    @After
-    fun tearDown() {
-        mockWebServer.shutdown()
     }
 
+
     @Test
     fun givenValidUserId_whenGetProfileWithFakeApi_thenReturnsProfile() = runTest {
         // Act
@@ -61,100 +35,4 @@ class UserRepositoryTest {
         Truth.assertThat(profileResult.getOrThrow().places).isEqualTo(expectedPlaces)
     }
 
-    @Test
-    fun givenValidUserId_whenGetProfileWithMockWebServer_thenReturnsProfile() = runTest {
-        // Arrange
-        val user = User(id = "1", username = "test-user")
-        val places = listOf(
-            Place(
-                id = "1",
-                name = "Test Place 1",
-                coordinates = Coordinates(latitude = 1.0, longitude = 1.0)
-            ),
-            Place(
-                id = "2",
-                name = "Test Place 2",
-                coordinates = Coordinates(latitude = 2.0, longitude = 2.0)
-            )
-        )
-
-        // Prepare mock responses with proper JSON structure
-        mockWebServer.enqueue(
-            MockResponse()
-                .setResponseCode(200)
-                .setBody("""
-                    {
-                        "id": "1",
-                        "username": "test-user"
-                    }
-                """.trimIndent())
-        )
-        mockWebServer.enqueue(
-            MockResponse()
-                .setResponseCode(200)
-                .setBody("""
-                    [
-                        {
-                            "id": "1",
-                            "name": "Test Place 1",
-                            "coordinates": {
-                                "latitude": 1.0,
-                                "longitude": 1.0
-                            }
-                        },
-                        {
-                            "id": "2",
-                            "name": "Test Place 2",
-                            "coordinates": {
-                                "latitude": 2.0,
-                                "longitude": 2.0
-                            }
-                        }
-                    ]
-                """.trimIndent())
-        )
-
-        // Act
-        val repository = UserRepositoryImpl(mockApi)
-        val result = repository.getProfile("1")
-
-        // Assert
-        Truth.assertThat(result.isSuccess).isTrue()
-        Truth.assertThat(result.getOrThrow().user).isEqualTo(user)
-        Truth.assertThat(result.getOrThrow().places).isEqualTo(places)
-    }
-
-    @Test
-    fun givenInvalidUserId_whenGetProfile_thenReturnsError() = runTest {
-        // Arrange
-        mockWebServer.enqueue(
-            MockResponse()
-                .setResponseCode(404)
-                .setBody("""
-                    {
-                        "error": "User not found",
-                        "status": 404
-                    }
-                """.trimIndent())
-        )
-
-        mockWebServer.enqueue(
-            MockResponse()
-                .setResponseCode(404)
-                .setBody("""
-                    {
-                        "error": "User not found",
-                        "status": 404
-                    }
-                """.trimIndent())
-        )
-
-        // Act
-        val repository = UserRepositoryImpl(mockApi)
-        val result = repository.getProfile("invalid-id")
-
-        // Assert
-        Truth.assertThat(result.isFailure).isTrue()
-        Truth.assertThat(result.exceptionOrNull()).isInstanceOf(HttpException::class.java)
-    }
 }
\ No newline at end of file
diff --git a/app/src/test/java/com/juandgaines/testground/presentation/ProfileViewModelTest.kt b/app/src/test/java/com/juandgaines/testground/presentation/ProfileViewModelTest.kt
index 8a1eecc..653cc18 100644
--- a/app/src/test/java/com/juandgaines/testground/presentation/ProfileViewModelTest.kt
+++ b/app/src/test/java/com/juandgaines/testground/presentation/ProfileViewModelTest.kt
@@ -3,11 +3,6 @@ package com.juandgaines.testground.presentation
 import androidx.lifecycle.SavedStateHandle
 import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
-import com.juandgaines.testground.domain.Coordinates
-import com.juandgaines.testground.domain.Place
-import com.juandgaines.testground.domain.Profile
-import com.juandgaines.testground.domain.User
-import com.juandgaines.testground.domain.UserRepository
 import com.juandgaines.testground.util.MainDispatcherRule
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.advanceUntilIdle
@@ -15,7 +10,6 @@ import kotlinx.coroutines.test.runTest
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import java.util.UUID
 
 @OptIn(ExperimentalCoroutinesApi::class)
 class ProfileViewModelTest {
@@ -65,6 +59,24 @@ class ProfileViewModelTest {
         assertThat(viewModel.state.value.isLoading).isFalse()
     }
 
+    @Test
+    fun givenLoadingState_whenLoadProfile_thenStateUpdatesCorrectly() = runTest {
+        // Act & Assert
+        viewModel.state.test {
+            val emission1 = awaitItem()
+            assertThat(emission1.isLoading).isFalse()
+
+            viewModel.loadProfile()
+
+            val emission2 = awaitItem()
+            assertThat(emission2.isLoading).isTrue()
+
+            val emission3 = awaitItem()
+            assertThat(emission3.isLoading).isFalse()
+            assertThat(emission3.profile).isEqualTo(repository.profileToReturn)
+        }
+    }
+
 
 }