diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/build.gradle b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/build.gradle
index 333a309..1f92faf 100644
--- a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/build.gradle
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/build.gradle
@@ -9,11 +9,11 @@ apply plugin: 'kotlin-kapt'
 apply plugin: "androidx.navigation.safeargs.kotlin"
 
 android {
-  compileSdkVersion 28
+  compileSdkVersion 30
   defaultConfig {
     applicationId "com.raywenderlich.codingcompanionfinder"
     minSdkVersion 21
-    targetSdkVersion 28
+    targetSdkVersion 30
     versionCode 1
     versionName "1.0"
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -27,17 +27,34 @@ android {
   dataBinding {
     enabled = true
   }
+
+  sourceSets {
+    String sharedTestDir = 'src/sharedTest/java'
+    String sharedResources = 'src/sharedTest/assets'
+    test {
+      java.srcDirs += sharedTestDir
+      resources.srcDirs += sharedResources
+    }
+    androidTest {
+      java.srcDirs += sharedTestDir
+      resources.srcDirs += sharedResources
+    }
+  }
+
+  testOptions {
+    unitTests.includeAndroidResources = true
+    unitTests.returnDefaultValues = true
+  }
 }
 
 dependencies {
   // android stuff
   implementation fileTree(dir: 'libs', include: ['*.jar'])
-  implementation 'com.google.android.material:material:1.0.0'
-  implementation "com.android.support:design:28.0.0"
-  implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
-  implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2'
-  implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.1'
-  implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.1.1'
+  implementation 'com.google.android.material:material:1.3.0'
+  implementation 'androidx.appcompat:appcompat:1.3.0'
+  implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+  implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_version"
+  implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_version"
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
   implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 
@@ -46,48 +63,69 @@ dependencies {
   implementation "android.arch.navigation:navigation-fragment-ktx:1.0.0" // use -ktx for
 
   // Glide
-  implementation("com.github.bumptech.glide:glide:4.8.0") {
+  implementation("com.github.bumptech.glide:glide:4.12.0") {
     exclude group: "com.android.support"
   }
-  kapt 'com.github.bumptech.glide:compiler:4.8.0'
+  kapt 'com.github.bumptech.glide:compiler:4.12.0'
 
   // carouselview library
   implementation "com.synnapps:carouselview:0.1.5"
 
   // retrofit
-  implementation "com.squareup.okhttp3:logging-interceptor:3.11.0"
-  implementation 'com.squareup.retrofit2:retrofit:2.5.0'
-  implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
-  implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2'
+  implementation "com.squareup.okhttp3:logging-interceptor:3.14.9"
+  implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+  implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
 
   // eventbus
   implementation 'org.greenrobot:eventbus:3.1.1'
 
   // Architecture components
-  def lifecycle_version = "2.0.0"
+  def lifecycle_version = "2.2.0"
   implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
   kapt "androidx.lifecycle:lifecycle-compiler:$lifecycle_version"
 
   // Koin
-  implementation 'org.koin:koin-android-viewmodel:1.0.1'
-  androidTestImplementation 'org.koin:koin-test:1.0.1'
+  implementation 'org.koin:koin-android-viewmodel:2.0.1'
+  androidTestImplementation 'org.koin:koin-test:2.0.1'
 
   // permissions
-  implementation 'com.karumi:dexter:5.0.0'
+  implementation 'com.karumi:dexter:6.0.0'
+
+  def coroutinesVersion = "1.5.0"
 
   // testing dependencies
-  testImplementation 'junit:junit:4.12'
-  androidTestImplementation 'androidx.test:runner:1.2.0'
-  androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-  androidTestImplementation "androidx.test:rules:1.2.0"
-  androidTestImplementation "androidx.test.ext:junit:1.1.1"
-  androidTestImplementation "android.arch.navigation:navigation-testing:1.0.0-alpha08"
+  testImplementation 'junit:junit:4.13.2'
+  testImplementation 'androidx.test:runner:1.3.0'
+  testImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+  testImplementation "androidx.test:rules:1.3.0"
+  testImplementation "androidx.test.ext:junit:1.1.2"
+  testImplementation "androidx.navigation:navigation-testing:2.3.5"
+  testImplementation 'com.squareup.okhttp3:mockwebserver:3.12.0'
+  testImplementation "androidx.test.espresso:espresso-contrib:3.3.0"
+  testImplementation 'org.robolectric:robolectric:4.5.1'
+  testImplementation 'org.koin:koin-test:2.0.1'
+  testImplementation "androidx.arch.core:core-testing:2.1.0"
+  testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
+  testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion"
+  testImplementation 'com.github.javafaker:javafaker:0.18'
+  testImplementation 'androidx.test.espresso:espresso-intents:3.3.0'
+
+// Once https://issuetracker.google.com/127986458 is fixed this can be testImplementation
+// fragmentscenario testing
+  debugImplementation 'androidx.fragment:fragment-testing:1.3.4'
+  debugImplementation "androidx.test:core:1.3.0"
+
+  androidTestImplementation 'androidx.test.espresso:espresso-intents:3.3.0'
+  androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
+  androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion"
+  androidTestImplementation "androidx.arch.core:core-testing:2.1.0"
+  androidTestImplementation "org.robolectric:annotations:4.5.1"
+  androidTestImplementation 'androidx.test:runner:1.3.0'
+  androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+  androidTestImplementation "androidx.test:rules:1.3.0"
+  androidTestImplementation "androidx.test.ext:junit:1.1.2"
+  androidTestImplementation "androidx.navigation:navigation-testing:2.3.5"
   androidTestImplementation 'com.squareup.okhttp3:mockwebserver:3.12.0'
-  androidTestImplementation "androidx.test.espresso:espresso-contrib:3.2.0"
-  androidTestImplementation 'androidx.test.espresso:espresso-intents:3.2.0'
-
-  // Once https://issuetracker.google.com/127986458 is fixed this can betestImplementation
-  // fragmentscenario testing
-  debugImplementation 'androidx.fragment:fragment-testing:1.1.0-rc04'
-  debugImplementation "androidx.test:core:1.2.0"
+  androidTestImplementation "androidx.test.espresso:espresso-contrib:3.3.0"
+  androidTestImplementation 'com.github.javafaker:javafaker:0.18'
 }
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/androidTest/java/.gitkeep b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/androidTest/java/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/androidTest/java/com/raywenderlich/codingcompanionfinder/.gitkeep b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/androidTest/java/com/raywenderlich/codingcompanionfinder/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/androidTest/java/com/raywenderlich/codingcompanionfinder/SimpleIdlingResource.kt b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/androidTest/java/com/raywenderlich/codingcompanionfinder/SimpleIdlingResource.kt
deleted file mode 100644
index 0f8d377..0000000
--- a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/androidTest/java/com/raywenderlich/codingcompanionfinder/SimpleIdlingResource.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.raywenderlich.codingcompanionfinder
-
-import androidx.annotation.Nullable
-import androidx.test.espresso.IdlingResource
-import java.util.concurrent.atomic.AtomicInteger
-
-class SimpleIdlingResource : IdlingResource {
-
-  // 1
-  @Nullable
-  @Volatile
-  private var callback: IdlingResource.ResourceCallback? = null
-
-  // 2
-  // Idleness is controlled with this boolean.
-  var activeResources = AtomicInteger(0)
-
-  override fun getName(): String {
-    return this.javaClass.name
-  }
-
-  // 3
-  override fun isIdleNow(): Boolean {
-    return activeResources.toInt() < 1
-  }
-
-  override fun registerIdleTransitionCallback(callback: IdlingResource.ResourceCallback) {
-    this.callback = callback
-  }
-
-  // 4
-  fun incrementBy(incrementValue: Int) {
-    if (activeResources.addAndGet(incrementValue) < 1 && callback != null) {
-      callback!!.onTransitionToIdle()
-    }
-  }
-}
\ No newline at end of file
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/androidTest/java/com/raywenderlich/codingcompanionfinder/ViewCompanionTest.kt b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/androidTest/java/com/raywenderlich/codingcompanionfinder/ViewCompanionTest.kt
deleted file mode 100644
index d7e82ec..0000000
--- a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/androidTest/java/com/raywenderlich/codingcompanionfinder/ViewCompanionTest.kt
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.raywenderlich.codingcompanionfinder
-
-import android.app.Activity
-import android.app.Instrumentation
-import android.content.Intent
-import androidx.fragment.app.testing.launchFragmentInContainer
-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.intent.matcher.IntentMatchers
-import androidx.test.espresso.intent.rule.IntentsTestRule
-import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
-import androidx.test.espresso.matcher.ViewMatchers.withText
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.rule.GrantPermissionRule
-import com.raywenderlich.codingcompanionfinder.models.Address
-import com.raywenderlich.codingcompanionfinder.models.Animal
-import com.raywenderlich.codingcompanionfinder.models.Breeds
-import com.raywenderlich.codingcompanionfinder.models.Contact
-import com.raywenderlich.codingcompanionfinder.searchforcompanion.ViewCompanionFragment
-import com.raywenderlich.codingcompanionfinder.searchforcompanion.ViewCompanionFragmentArgs
-import org.hamcrest.CoreMatchers
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class ViewCompanionTest {
-
-  @get:Rule
-  val grantPermissionRule: GrantPermissionRule =
-    GrantPermissionRule.grant(android.Manifest.permission.CALL_PHONE)
-  @get:Rule
-  val intentsTestRule = IntentsTestRule(MainActivity::class.java)
-
-  @Before
-  fun beforeTestsRun() {
-// 1
-    val animal = Animal(
-      22,
-      Contact(
-        phone = "(706) 236-4537",
-        email = "coding.companion@razware.com",
-        address = Address(
-          "",
-          "",
-          "Atlanta",
-          "GA",
-          "30303",
-          "USA"
-        )
-      ),
-      "5",
-      "small",
-      arrayListOf(),
-      Breeds("shih tzu", "", false, false),
-      "Spike",
-      "male",
-      "A sweet little guy with spikey teeth!"
-    )
-// 2
-    val bundle = ViewCompanionFragmentArgs(animal).toBundle()
-// 3
-    launchFragmentInContainer<ViewCompanionFragment>(
-      bundle,
-      R.style.AppTheme
-    )
-  }
-
-  @Test
-  fun check_that_all_values_display_correctly() {
-    onView(withText("Spike")).check(matches(isDisplayed()))
-    onView(withText("Atlanta, GA")).check(matches(isDisplayed()))
-    onView(withText("shih tzu")).check(matches(isDisplayed()))
-    onView(withText("5")).check(matches(isDisplayed()))
-    onView(withText("male")).check(matches(isDisplayed()))
-    onView(withText("small")).check(matches(isDisplayed()))
-    onView(withText("A sweet little guy with spikey teeth!")).check(matches(isDisplayed()))
-    onView(withText("(706) 236-4537")).check(matches(isDisplayed()))
-    onView(withText("coding.companion@razware.com")).check(matches(isDisplayed()))
-  }
-
-  @Test
-  fun verify_that_tapping_on_phone_number_dials_phone() {
-// 1
-    val intent = Intent()
-    val result = Instrumentation.ActivityResult(Activity.RESULT_OK, intent)
-    Intents.intending(
-      CoreMatchers.allOf(
-        IntentMatchers.hasAction(Intent.ACTION_CALL)
-      )
-    ).respondWith(result)
-// 2
-    onView(withText("(706) 236-4537")).perform(ViewActions.click())
-    // 3
-    Intents.intended(
-      CoreMatchers.allOf(
-        IntentMatchers.hasAction(Intent.ACTION_CALL),
-        IntentMatchers.hasData("tel:(706) 236-4537")
-      )
-    )
-  }
-}
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/androidTest/resources/mockito-extensions/org.mockito.plugins.MockMaker b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/androidTest/resources/mockito-extensions/org.mockito.plugins.MockMaker
deleted file mode 100644
index 1f0955d..0000000
--- a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/androidTest/resources/mockito-extensions/org.mockito.plugins.MockMaker
+++ /dev/null
@@ -1 +0,0 @@
-mock-maker-inline
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/CodingCompanionFinder.kt b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/CodingCompanionFinder.kt
index 8fe750d..6a29144 100644
--- a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/CodingCompanionFinder.kt
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/CodingCompanionFinder.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -30,11 +30,21 @@
 package com.raywenderlich.codingcompanionfinder
 
 import android.app.Application
-import org.koin.android.ext.android.startKoin
+import android.util.Log
+import org.koin.android.ext.koin.androidContext
+import org.koin.core.context.startKoin
+import org.koin.core.error.KoinAppAlreadyStartedException
 
-class CodingCompanionFinder: Application(){
+class CodingCompanionFinder : Application() {
   override fun onCreate() {
     super.onCreate()
-    startKoin(this, listOf(appModule, urlsModule))
+    try {
+      startKoin {
+        androidContext(this@CodingCompanionFinder)
+        modules(listOf(appModule, urlsModule))
+      }
+    } catch (koinAlreadyStartedException: KoinAppAlreadyStartedException) {
+      Log.i("CodingCompanionFinder", "KoinAppAlreadyStartedException, should only happen in tests")
+    }
   }
 }
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/CodingCompanionGlideModule.kt b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/CodingCompanionGlideModule.kt
index 79ab31d..2299c1b 100644
--- a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/CodingCompanionGlideModule.kt
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/CodingCompanionGlideModule.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/KoinModule.kt b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/KoinModule.kt
index 006310f..e57cec4 100644
--- a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/KoinModule.kt
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/KoinModule.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -29,22 +29,22 @@
  */
 package com.raywenderlich.codingcompanionfinder
 
-import com.jakewharton.retrofit2.adapter.kotlin.coroutines.CoroutineCallAdapterFactory
 import com.raywenderlich.codingcompanionfinder.retrofit.AuthorizationInterceptor
 import com.raywenderlich.codingcompanionfinder.retrofit.PetFinderService
 import com.raywenderlich.codingcompanionfinder.searchforcompanion.SearchForCompanionViewModel
 import com.raywenderlich.codingcompanionfinder.searchforcompanion.ViewCompanionViewModel
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
-import org.koin.android.viewmodel.ext.koin.viewModel
-import org.koin.dsl.module.module
+import org.koin.android.viewmodel.dsl.viewModel
+import org.koin.core.qualifier.named
+import org.koin.dsl.module
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import java.util.concurrent.TimeUnit
 
 const val PETFINDER_URL = "PETFINDER_URL"
 val urlsModule = module {
-  single(name = PETFINDER_URL){MainActivity.DEFAULT_PETFINDER_URL}
+  single(named(PETFINDER_URL)){MainActivity.DEFAULT_PETFINDER_URL}
 }
 val appModule = module {
   single<PetFinderService> {
@@ -56,9 +56,8 @@ val appModule = module {
       .addInterceptor(AuthorizationInterceptor())
       .build()
     Retrofit.Builder()
-      .baseUrl(get(PETFINDER_URL) as String)
+      .baseUrl(get<String>(named(PETFINDER_URL)))
       .addConverterFactory(GsonConverterFactory.create())
-      .addCallAdapterFactory(CoroutineCallAdapterFactory())
       .client(client)
       .build().create(PetFinderService::class.java)
   }
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/MainActivity.kt b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/MainActivity.kt
index 601705f..abdd22b 100644
--- a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/MainActivity.kt
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/MainActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -35,7 +35,6 @@ import android.os.Bundle
 import androidx.navigation.Navigation
 import androidx.navigation.ui.NavigationUI
 import com.google.android.material.bottomnavigation.BottomNavigationView
-import com.jakewharton.retrofit2.adapter.kotlin.coroutines.CoroutineCallAdapterFactory
 import com.raywenderlich.codingcompanionfinder.retrofit.AuthorizationInterceptor
 import com.raywenderlich.codingcompanionfinder.retrofit.PetFinderService
 import com.raywenderlich.codingcompanionfinder.testhooks.IdlingEntity
@@ -72,7 +71,6 @@ class MainActivity : AppCompatActivity() {
       petFinderService = Retrofit.Builder()
         .baseUrl(baseUrl)
         .addConverterFactory(GsonConverterFactory.create())
-        .addCallAdapterFactory(CoroutineCallAdapterFactory())
         .client(client)
         .build().create(PetFinderService::class.java)
     }
@@ -110,8 +108,8 @@ class MainActivity : AppCompatActivity() {
   companion object {
     val PETFINDER_URI = "petfinder_uri"
     val PETFINDER_KEY = "petfinder_key"
-    val API_KEY = "your_key"
-    val API_SECRET = "your_secret"
+    val API_KEY = "your_api_key"
+    val API_SECRET = "your_api_secret"
     val DEFAULT_PETFINDER_URL = "https://api.petfinder.com/v2/"
   }
 }
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/SplashActivity.kt b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/SplashActivity.kt
index e151326..739afdc 100644
--- a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/SplashActivity.kt
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/SplashActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Address.kt b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Address.kt
index 0b55dde..e262d1a 100644
--- a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Address.kt
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Address.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -30,8 +30,6 @@
 
 package com.raywenderlich.codingcompanionfinder.models
 
-import java.io.Serializable
-
 data class Address(
   val address1: String,
   val address2: String,
@@ -39,4 +37,4 @@ data class Address(
   val state: String,
   val postcode: String,
   val country: String
-): Serializable
+)
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Animal.kt b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Animal.kt
index c03a383..9574b81 100644
--- a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Animal.kt
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Animal.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/AnimalResult.kt b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/AnimalResult.kt
index 4a96587..f34a726 100644
--- a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/AnimalResult.kt
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/AnimalResult.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Breeds.kt b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Breeds.kt
index 9d37fb6..f2a0a09 100644
--- a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Breeds.kt
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Breeds.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -30,11 +30,9 @@
 
 package com.raywenderlich.codingcompanionfinder.models
 
-import java.io.Serializable
-
 data class Breeds(
     val primary: String,
     val secondary: String,
     val mixed: Boolean,
     val unknown: Boolean
-) : Serializable
+)
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Contact.kt b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Contact.kt
index d5020a3..9513ea1 100644
--- a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Contact.kt
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Contact.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -30,10 +30,8 @@
 
 package com.raywenderlich.codingcompanionfinder.models
 
-import java.io.Serializable
-
 data class Contact(
   val phone: String = "",
   val email: String = "",
   val address: Address
-) : Serializable
+)
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Photo.kt b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Photo.kt
index 64192fb..4405590 100644
--- a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Photo.kt
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Photo.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -30,12 +30,10 @@
 
 package com.raywenderlich.codingcompanionfinder.models
 
-import java.io.Serializable
-
 data class Photo(
     val small: String = "",
     val medium: String = "",
     val large: String = "",
     val xlarge: String = "",
     val full: String = ""
-) : Serializable
+)
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Token.kt b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Token.kt
index 57dd581..8e60b13 100644
--- a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Token.kt
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Token.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/randomcompanion/RandomCompanionFragment.kt b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/randomcompanion/RandomCompanionFragment.kt
index be596ba..3ab9f7c 100644
--- a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/randomcompanion/RandomCompanionFragment.kt
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/randomcompanion/RandomCompanionFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -43,7 +43,6 @@ import com.raywenderlich.codingcompanionfinder.MainActivity
 import com.raywenderlich.codingcompanionfinder.R
 import com.raywenderlich.codingcompanionfinder.models.Animal
 import com.synnapps.carouselview.CarouselView
-import com.synnapps.carouselview.ViewListener
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
@@ -70,8 +69,7 @@ class RandomCompanionFragment : Fragment() {
       key = (activity as MainActivity).accessToken
       (activity as MainActivity).petFinderService?.let { petFinderService ->
 
-        val animalsRequest = petFinderService.getAnimals((activity as MainActivity).accessToken, 1)
-        val animalsResponse = animalsRequest.await()
+        val animalsResponse = petFinderService.getAnimals((activity as MainActivity).accessToken, 1)
         if (animalsResponse.isSuccessful) {
           animalsResponse.body()?.let {animalResult ->
             if (animalResult.animals.size > 0) {
@@ -114,17 +112,14 @@ class RandomCompanionFragment : Fragment() {
 
     view?.let {
       petCaroselView = it.findViewById(R.id.petCarouselView)
-      petCaroselView.setViewListener(object : ViewListener {
-
-        override fun setViewForPosition(position: Int): View {
-          val carouselItemView = layoutInflater.inflate(R.layout.companion_photo_layout, null)
-          val imageView = carouselItemView.findViewById<ImageView>(R.id.petImage)
-          GlideApp.with(randomCompanionFragment).load(petPhotos[position])
-              .fitCenter()
-              .into(imageView)
-          return carouselItemView
-        }
-      })
+      petCaroselView.setViewListener { position ->
+        val carouselItemView = layoutInflater.inflate(R.layout.companion_photo_layout, null)
+        val imageView = carouselItemView.findViewById<ImageView>(R.id.petImage)
+        GlideApp.with(randomCompanionFragment).load(petPhotos[position])
+          .fitCenter()
+          .into(imageView)
+        carouselItemView
+      }
       petCaroselView.pageCount = petPhotos.size
     }
   }
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/retrofit/AuthorizationInterceptor.kt b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/retrofit/AuthorizationInterceptor.kt
index 569cfc5..4309ae8 100644
--- a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/retrofit/AuthorizationInterceptor.kt
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/retrofit/AuthorizationInterceptor.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -34,8 +34,8 @@ import com.raywenderlich.codingcompanionfinder.MainActivity
 import com.raywenderlich.codingcompanionfinder.models.Token
 import okhttp3.Interceptor
 import okhttp3.Response
-import org.koin.standalone.KoinComponent
-import org.koin.standalone.inject
+import org.koin.core.KoinComponent
+import org.koin.core.inject
 import java.io.IOException
 
 // 1
@@ -53,13 +53,14 @@ class AuthorizationInterceptor : Interceptor, KoinComponent {
       val tokenRequest = petFinderService.getToken(clientId =
       MainActivity.API_KEY, clientSecret = MainActivity.API_SECRET)
       val tokenResponse = tokenRequest.execute()
-      if (tokenResponse.isSuccessful()) {
+      if (tokenResponse.isSuccessful) {
         tokenResponse.body()?.let {
           token = it
           val builder =
             mainRequest.newBuilder().header("Authorization", "Bearer " +
                 it.accessToken)
               .method(mainRequest.method(), mainRequest.body())
+          mainResponse.close()
           mainResponse = chain.proceed(builder.build())
         } }
     }
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/retrofit/PetFinderService.kt b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/retrofit/PetFinderService.kt
index 777e324..7ae6826 100644
--- a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/retrofit/PetFinderService.kt
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/retrofit/PetFinderService.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -31,7 +31,6 @@
 package com.raywenderlich.codingcompanionfinder.retrofit
 
 import com.raywenderlich.codingcompanionfinder.models.*
-import kotlinx.coroutines.Deferred
 import retrofit2.Call
 import retrofit2.Response
 import retrofit2.http.*
@@ -46,9 +45,9 @@ interface PetFinderService {
       @Field("client_secret") clientSecret: String): Call<Token>
 
   @GET("animals")
-  fun getAnimals(
+  suspend fun getAnimals(
       @Header("Authorization")  accessToken: String,
       @Query("limit") limit: Int = 20,
       @Query("location") location: String? = null
-  ) : Deferred<Response<AnimalResult>>
+  ) : Response<AnimalResult>
 }
\ No newline at end of file
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/CompanionAdapter.kt b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/CompanionAdapter.kt
index e717f45..fb0cf14 100644
--- a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/CompanionAdapter.kt
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/CompanionAdapter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/CompanionViewHolder.kt b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/CompanionViewHolder.kt
index 022e59a..01a55fb 100644
--- a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/CompanionViewHolder.kt
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/CompanionViewHolder.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -30,7 +30,6 @@
 
 package com.raywenderlich.codingcompanionfinder.searchforcompanion
 
-import android.os.Bundle
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/SearchForCompanionFragment.kt b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/SearchForCompanionFragment.kt
index f84ea4a..e06a497 100644
--- a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/SearchForCompanionFragment.kt
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/SearchForCompanionFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -34,28 +34,14 @@ import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
-import android.view.View.INVISIBLE
-import android.view.View.VISIBLE
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.button.MaterialButton
-import com.google.android.material.textfield.TextInputEditText
 import com.raywenderlich.codingcompanionfinder.MainActivity
 
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
 import android.view.inputmethod.InputMethodManager
-import android.widget.TextView
-import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModelProviders
-import com.raywenderlich.codingcompanionfinder.R
 import com.raywenderlich.codingcompanionfinder.databinding.FragmentSearchForCompanionBinding
-import com.raywenderlich.codingcompanionfinder.models.Animal
-import com.raywenderlich.codingcompanionfinder.testhooks.IdlingEntity
-import org.greenrobot.eventbus.EventBus
 import org.koin.android.viewmodel.ext.android.viewModel
 
 class SearchForCompanionFragment : Fragment() {
@@ -83,31 +69,24 @@ class SearchForCompanionFragment : Fragment() {
   }
 
   override fun onActivityCreated(savedInstanceState: Bundle?) {
-// 1
     fragmentSearchForCompanionBinding.searchButton.setOnClickListener {
       try {
         val inputMethodManager =
             activity?.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager?
         inputMethodManager!!.hideSoftInputFromWindow(
-            activity?.getCurrentFocus()?.getWindowToken(),
+            activity?.currentFocus?.windowToken,
             0
         )
       } catch (e: Exception) {
         // only happens when the keyboard is already closed
       }
-// 2
       searchForCompanionViewModel.searchForCompanions()
     }
-// 3
     setupSearchForCompanions()
     super.onActivityCreated(savedInstanceState)
   }
 
   private fun setupSearchForCompanions() {
-// 1
-    searchForCompanionViewModel.accessToken = (activity as
-        MainActivity).accessToken
-// 2
     viewManager = LinearLayoutManager(context)
     companionAdapter =
         CompanionAdapter(searchForCompanionViewModel.animals.value ?: arrayListOf(), this)
@@ -116,12 +95,11 @@ class SearchForCompanionFragment : Fragment() {
           layoutManager = viewManager
           adapter = companionAdapter
         }
-// 3
-    searchForCompanionViewModel.animals.observe(this,
-        Observer<ArrayList<Animal>?> {
-          companionAdapter.animals = it ?: arrayListOf()
-          companionAdapter.notifyDataSetChanged()
-        })
+    searchForCompanionViewModel.animals.observe(viewLifecycleOwner,
+      {
+        companionAdapter.animals = it ?: arrayListOf()
+        companionAdapter.notifyDataSetChanged()
+      })
   }
 
 }
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/SearchForCompanionViewModel.kt b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/SearchForCompanionViewModel.kt
index fa098cb..524918b 100644
--- a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/SearchForCompanionViewModel.kt
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/SearchForCompanionViewModel.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -42,41 +42,34 @@ import kotlinx.coroutines.launch
 import org.greenrobot.eventbus.EventBus
 
 class SearchForCompanionViewModel(val petFinderService: PetFinderService): ViewModel() {
-  val noResultsViewVisiblity : MutableLiveData<Int> = MutableLiveData<Int>().apply { INVISIBLE}
+  val noResultsViewVisiblity : MutableLiveData<Int> = MutableLiveData<Int>()
   val companionLocation : MutableLiveData<String> = MutableLiveData()
 
-  // 1
-  val animals: MutableLiveData<ArrayList<Animal>> = MutableLiveData<ArrayList<Animal>>().apply { arrayListOf<Animal>() }
-  lateinit var accessToken: String
+  val animals: MutableLiveData<ArrayList<Animal>> = MutableLiveData<ArrayList<Animal>>()
+  var accessToken: String = ""
 
   fun searchForCompanions() {
 
     GlobalScope.launch {
 
       EventBus.getDefault().post(IdlingEntity(1))
-// 2
-      val getAnimalsRequest = petFinderService.getAnimals(
+      val searchForPetResponse = petFinderService.getAnimals(
           accessToken,
           location = companionLocation.value
       )
 
-      val searchForPetResponse = getAnimalsRequest.await()
-
       GlobalScope.launch(Dispatchers.Main) {
         if (searchForPetResponse.isSuccessful) {
           searchForPetResponse.body()?.let {
             // 3
             animals.postValue(it.animals)
             if (it.animals.size > 0) {
-// 3
               noResultsViewVisiblity.postValue(INVISIBLE)
             } else {
-// 3
               noResultsViewVisiblity.postValue(View.VISIBLE)
             }
           }
         } else {
-// 3
           noResultsViewVisiblity.postValue(View.VISIBLE)
         }
       }
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/ViewCompanionFragment.kt b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/ViewCompanionFragment.kt
index b5fb8a8..f749a76 100644
--- a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/ViewCompanionFragment.kt
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/ViewCompanionFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -39,11 +39,14 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
-import android.widget.TextView
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProviders
+import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.fragment.navArgs
 import com.karumi.dexter.Dexter
+import com.karumi.dexter.PermissionToken
+import com.karumi.dexter.listener.PermissionDeniedResponse
+import com.karumi.dexter.listener.PermissionGrantedResponse
+import com.karumi.dexter.listener.PermissionRequest
 import com.karumi.dexter.listener.single.PermissionListener
 import com.raywenderlich.codingcompanionfinder.GlideApp
 
@@ -51,101 +54,98 @@ import com.raywenderlich.codingcompanionfinder.R
 import com.raywenderlich.codingcompanionfinder.databinding.FragmentViewCompanionBinding
 import com.raywenderlich.codingcompanionfinder.models.Animal
 import com.synnapps.carouselview.CarouselView
-import com.synnapps.carouselview.ViewListener
-import com.karumi.dexter.PermissionToken
-import com.karumi.dexter.listener.PermissionDeniedResponse
-import com.karumi.dexter.listener.PermissionGrantedResponse
-import com.karumi.dexter.listener.PermissionRequest
-
 
 class ViewCompanionFragment : Fragment() {
-  companion object {
-    val ANIMAL: String = "ANIMAL"
-  }
 
-  private lateinit var animal: Animal
-  private lateinit var petPhotos: ArrayList<String>
-  private lateinit var petCaroselView: CarouselView
-  private lateinit var viewCompanionFragment: ViewCompanionFragment
-  private lateinit var fragmentViewCompanionBinding: FragmentViewCompanionBinding
-  private lateinit var viewCompanionViewModel: ViewCompanionViewModel
+    companion object {
+        val ANIMAL: String = "ANIMAL"
+    }
 
-  val args: ViewCompanionFragmentArgs by navArgs()
-  override fun onCreateView(
-    inflater: LayoutInflater, container: ViewGroup?,
-    savedInstanceState: Bundle?
-  ): View? {
-    animal = args.animal
-    viewCompanionFragment = this
-    // 1
-    fragmentViewCompanionBinding =
-      FragmentViewCompanionBinding.inflate(inflater, container, false)
-    // 2
-    viewCompanionViewModel = ViewModelProviders.of(this).get(ViewCompanionViewModel::class.java)
+    private lateinit var animal: Animal
+    private lateinit var petPhotos: ArrayList<String>
+    private lateinit var petCaroselView: CarouselView
+    private lateinit var viewCompanionFragment: ViewCompanionFragment
+    private lateinit var fragmentViewCompanionBinding: FragmentViewCompanionBinding
+    private lateinit var viewCompanionViewModel: ViewCompanionViewModel
+
+    val args: ViewCompanionFragmentArgs by navArgs()
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        animal = args.animal
+        viewCompanionFragment = this
+        // 1
+        fragmentViewCompanionBinding = FragmentViewCompanionBinding.inflate(inflater, container, false)
+        // 2
+        viewCompanionViewModel = ViewModelProvider(this).get(ViewCompanionViewModel::class.java)
 // 3
-    viewCompanionViewModel.populateFromAnimal(animal)
+        viewCompanionViewModel.populateFromAnimal(animal)
 // 4
-    fragmentViewCompanionBinding.viewCompanionViewModel =
-      viewCompanionViewModel
+        fragmentViewCompanionBinding.viewCompanionViewModel =
+            viewCompanionViewModel
 // 5
-
-    setupPhonNumberOnClick()
-    return fragmentViewCompanionBinding.root
-  }
-
-  override fun onResume() {
-    populatePhotos()
-    super.onResume()
-  }
-
-  private fun populatePhotos() {
-    petPhotos = ArrayList()
-    animal.photos.forEach { photo ->
-      petPhotos.add(photo.full)
+        setupPhonNumberOnClick()
+        return fragmentViewCompanionBinding.root
     }
 
-    view?.let {
-      petCaroselView = it.findViewById(R.id.petCarouselView)
-      petCaroselView.setViewListener(object : ViewListener {
-
-        override fun setViewForPosition(position: Int): View {
-          val carouselItemView = layoutInflater.inflate(R.layout.companion_photo_layout, null)
-          val imageView = carouselItemView.findViewById<ImageView>(R.id.petImage)
-          GlideApp.with(viewCompanionFragment).load(petPhotos[position])
-            .fitCenter()
-            .into(imageView)
-          return carouselItemView
-        }
-      })
-      petCaroselView.pageCount = petPhotos.size
+    override fun onResume() {
+        populatePhotos()
+        super.onResume()
     }
-  }
 
-  private fun setupPhonNumberOnClick(){
-    fragmentViewCompanionBinding.telephone.setOnClickListener {
-      Dexter.withActivity(activity)
-        .withPermission(Manifest.permission.CALL_PHONE)
-        .withListener(
-          object : PermissionListener {
-            override fun onPermissionGranted(response: PermissionGrantedResponse) {/* ... */
-              val intent = Intent(Intent.ACTION_CALL, Uri.parse("tel:" + viewCompanionViewModel.telephone))
-              startActivity(intent)
-            }
-
-            override fun onPermissionDenied(response: PermissionDeniedResponse) {/* ... */
-            }
+    private fun populatePhotos() {
+        petPhotos = ArrayList()
+        animal.photos.forEach { photo ->
+            petPhotos.add(photo.full)
+        }
 
-            override fun onPermissionRationaleShouldBeShown(
-              permission: PermissionRequest,
-              token: PermissionToken
-            ) {/* ... */
-              token.continuePermissionRequest()
+        view?.let {
+            petCaroselView = it.findViewById(R.id.petCarouselView)
+            petCaroselView.setViewListener { position ->
+                val carouselItemView = layoutInflater.inflate(R.layout.companion_photo_layout, null)
+                val imageView = carouselItemView.findViewById<ImageView>(R.id.petImage)
+                GlideApp.with(viewCompanionFragment).load(petPhotos[position])
+                    .fitCenter()
+                    .into(imageView)
+                carouselItemView
             }
+            petCaroselView.pageCount = petPhotos.size
+        }
+    }
 
-          })
-        .onSameThread()
-        .check()
-
+    private fun setupPhonNumberOnClick(){
+        fragmentViewCompanionBinding.telephone.setOnClickListener {
+            // 1
+            Dexter.withActivity(activity)
+                .withPermission(Manifest.permission.CALL_PHONE)
+                .withListener(
+                    object : PermissionListener {
+                        // 3
+                        override fun onPermissionGranted(
+                            response: PermissionGrantedResponse
+                        ) {/* ... */
+                            val intent = Intent(Intent.ACTION_CALL, Uri.parse(
+                                "tel:" + viewCompanionViewModel.telephone))
+                            startActivity(intent)
+                        }
+
+                        override fun onPermissionDenied(
+                            response: PermissionDeniedResponse
+                        ) {/* ... */}
+
+                        // 2
+                        override fun onPermissionRationaleShouldBeShown(
+                            permission: PermissionRequest,
+                            token: PermissionToken
+                        ) {/* ... */
+                            token.continuePermissionRequest()
+                        }
+
+                    }
+                )
+                .onSameThread()
+                .check()
+        }
     }
-  }
 }
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/ViewCompanionViewModel.kt b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/ViewCompanionViewModel.kt
index a13ebbd..66f535c 100644
--- a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/ViewCompanionViewModel.kt
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/ViewCompanionViewModel.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/res/layout/activity_main.xml b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/res/layout/activity_main.xml
index a2f61af..b7bb84c 100644
--- a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/res/layout/activity_main.xml
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/res/layout/activity_main.xml
@@ -7,7 +7,7 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
-  <fragment
+  <androidx.fragment.app.FragmentContainerView
       android:id="@+id/mainPetfinderFragment"
       android:name="androidx.navigation.fragment.NavHostFragment"
       android:layout_width="match_parent"
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/res/layout/fragment_random_companion.xml b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/res/layout/fragment_random_companion.xml
index 5cd433e..74c6631 100644
--- a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/res/layout/fragment_random_companion.xml
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/res/layout/fragment_random_companion.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2019 Razeware LLC
+  ~ Copyright (c) 2021 Razeware LLC
   ~
   ~ Permission is hereby granted, free of charge, to any person obtaining a copy
   ~ of this software and associated documentation files (the "Software"), to deal
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/res/layout/fragment_search_for_companion.xml b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/res/layout/fragment_search_for_companion.xml
index eed81e2..db49816 100644
--- a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/res/layout/fragment_search_for_companion.xml
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/res/layout/fragment_search_for_companion.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2019 Razeware LLC
+  ~ Copyright (c) 2021 Razeware LLC
   ~
   ~ Permission is hereby granted, free of charge, to any person obtaining a copy
   ~ of this software and associated documentation files (the "Software"), to deal
@@ -27,7 +27,9 @@
   ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   ~ THE SOFTWARE.
   -->
-<layout>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
   <data>
 
@@ -36,10 +38,8 @@
       type="com.raywenderlich.codingcompanionfinder.searchforcompanion.SearchForCompanionViewModel" />
   </data>
 
-  <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
+  <androidx.constraintlayout.widget.ConstraintLayout
+      android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".searchforcompanion.SearchForCompanionFragment">
 
@@ -72,14 +72,15 @@
       </com.google.android.material.textfield.TextInputLayout>
 
       <com.google.android.material.button.MaterialButton
-        android:id="@+id/searchButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Find"
-        app:layout_constraintBottom_toBottomOf="@+id/searchField"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/searchField"
-        app:layout_constraintTop_toTopOf="@id/searchField" />
+          android:id="@+id/searchButton"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:text="Find"
+          app:layout_constraintBottom_toBottomOf="@+id/searchField"
+          app:layout_constraintEnd_toEndOf="parent"
+          app:layout_constraintStart_toEndOf="@id/searchField"
+          app:layout_constraintTop_toTopOf="@id/searchField"
+          app:layout_constraintVertical_bias="0.0" />
 
       <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/petRecyclerView"
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/res/layout/fragment_view_companion.xml b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/res/layout/fragment_view_companion.xml
index 39895a8..9ac6326 100644
--- a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/res/layout/fragment_view_companion.xml
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/res/layout/fragment_view_companion.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2019 Razeware LLC
+  ~ Copyright (c) 2021 Razeware LLC
   ~
   ~ Permission is hereby granted, free of charge, to any person obtaining a copy
   ~ of this software and associated documentation files (the "Software"), to deal
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/res/menu/bottom_navigation_menu.xml b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/res/menu/bottom_navigation_menu.xml
index b2ca6a3..11f139a 100644
--- a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/res/menu/bottom_navigation_menu.xml
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/res/menu/bottom_navigation_menu.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2019 Razeware LLC
+  ~ Copyright (c) 2021 Razeware LLC
   ~
   ~ Permission is hereby granted, free of charge, to any person obtaining a copy
   ~ of this software and associated documentation files (the "Software"), to deal
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/res/navigation/nav_graph.xml b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/res/navigation/nav_graph.xml
index 39a9a5b..b26ac8d 100644
--- a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/res/navigation/nav_graph.xml
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/main/res/navigation/nav_graph.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2019 Razeware LLC
+  ~ Copyright (c) 2021 Razeware LLC
   ~
   ~ Permission is hereby granted, free of charge, to any person obtaining a copy
   ~ of this software and associated documentation files (the "Software"), to deal
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/androidTest/assets/search_30318.json b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/sharedTest/assets/search_30318.json
similarity index 100%
rename from 18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/androidTest/assets/search_30318.json
rename to 18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/sharedTest/assets/search_30318.json
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/androidTest/java/com/raywenderlich/codingcompanionfinder/CommonTestDataUtil.kt b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/sharedTest/java/com/raywenderlich/codingcompanionfinder/CommonTestDataUtil.kt
similarity index 67%
rename from 18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/androidTest/java/com/raywenderlich/codingcompanionfinder/CommonTestDataUtil.kt
rename to 18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/sharedTest/java/com/raywenderlich/codingcompanionfinder/CommonTestDataUtil.kt
index 7a8a6af..38463d5 100644
--- a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/androidTest/java/com/raywenderlich/codingcompanionfinder/CommonTestDataUtil.kt
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/sharedTest/java/com/raywenderlich/codingcompanionfinder/CommonTestDataUtil.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -38,14 +38,51 @@ import java.io.InputStreamReader
 object CommonTestDataUtil {
 
   fun dispatch(request: RecordedRequest): MockResponse? {
+    val headers = request.headers
+    // 1
+    if(request.method.equals("POST")){
+      if(request.path.equals("/oauth2/token")){
+        return MockResponse().setResponseCode(200).setBody(
+          "{\"access_token\":\"valid_token\"}")
+      }
+    }
+    // 2
+    val authorization = headers.values("Authorization")
+    if (!authorization.isEmpty() &&
+      authorization.get(0).equals("Bearer valid_token")) {
+      return when (request.path) {
+        "/animals?limit=20&location=30318" -> {
+          MockResponse().setResponseCode(200).setBody(
+            CommonTestDataUtil.readFile("search_30318.json")
+          )
+        }
+        "/animals?limit=20&location=90210" -> {
+          MockResponse().setResponseCode(200)
+            .setBody("{\"animals\": []}")
+        }
+        else -> {
+          MockResponse().setResponseCode(404).setBody("{}")
+        }
+      }
+    } else {
+      // 3
+      return MockResponse().setResponseCode(401).setBody("{}")
+    }
+  }
+
+  fun nonInterceptedDispatch(
+    request: RecordedRequest
+  ): MockResponse? {
+    val headers = request.headers
     return when (request.path) {
       "/animals?limit=20&location=30318" -> {
         MockResponse().setResponseCode(200).setBody(
-            readFile("search_30318.json")
+          readFile("search_30318.json")
         )
       }
       "/animals?limit=20&location=90210" -> {
-        MockResponse().setResponseCode(200).setBody("{\"animals\": []}")
+        MockResponse().setResponseCode(200)
+          .setBody("{\"animals\": []}")
       }
       else -> {
         MockResponse().setResponseCode(404).setBody("{}")
@@ -54,8 +91,11 @@ object CommonTestDataUtil {
   }
 
   @Throws(IOException::class)
-  private fun readFile(jsonFileName: String): String {
-    val inputStream = this::class.java.getResourceAsStream("/assets/$jsonFileName")
+  fun readFile(jsonFileName: String): String {
+    val inputStream = this::class.java
+      .getResourceAsStream("/assets/$jsonFileName") ?:
+    this::class.java
+      .getResourceAsStream("/$jsonFileName")
         ?: throw NullPointerException(
             "Have you added the local resource correctly?, "
                 + "Hint: name it as: " + jsonFileName
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/androidTest/java/com/raywenderlich/codingcompanionfinder/FindCompanionInstrumentedTest.kt b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/sharedTest/java/com/raywenderlich/codingcompanionfinder/FindCompanionInstrumentedTest.kt
similarity index 79%
rename from 18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/androidTest/java/com/raywenderlich/codingcompanionfinder/FindCompanionInstrumentedTest.kt
rename to 18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/sharedTest/java/com/raywenderlich/codingcompanionfinder/FindCompanionInstrumentedTest.kt
index 41df33c..c7938eb 100644
--- a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/androidTest/java/com/raywenderlich/codingcompanionfinder/FindCompanionInstrumentedTest.kt
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/sharedTest/java/com/raywenderlich/codingcompanionfinder/FindCompanionInstrumentedTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -30,6 +30,8 @@
 
 package com.raywenderlich.codingcompanionfinder
 
+import android.app.Activity
+import android.app.Instrumentation
 import android.content.Intent
 import androidx.test.core.app.ActivityScenario
 import androidx.test.core.app.ApplicationProvider
@@ -38,8 +40,14 @@ import androidx.test.espresso.IdlingRegistry
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.action.ViewActions.typeText
 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.Intents.intending
+import androidx.test.espresso.intent.matcher.IntentMatchers.hasAction
+import androidx.test.espresso.intent.matcher.IntentMatchers.hasData
 import androidx.test.espresso.matcher.ViewMatchers.*
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.rule.GrantPermissionRule
 import com.raywenderlich.codingcompanionfinder.testhooks.IdlingEntity
 import okhttp3.mockwebserver.Dispatcher
 import okhttp3.mockwebserver.MockResponse
@@ -47,14 +55,23 @@ import okhttp3.mockwebserver.MockWebServer
 import okhttp3.mockwebserver.RecordedRequest
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
-import org.junit.*
+import org.hamcrest.CoreMatchers.allOf
+import org.junit.After
 
+import org.junit.Test
 import org.junit.runner.RunWith
-
-import org.koin.dsl.module.module
-import org.koin.standalone.StandAloneContext.loadKoinModules
-import org.koin.standalone.StandAloneContext.stopKoin
+import org.junit.Rule
+
+import org.junit.Before
+import org.junit.BeforeClass
+import org.koin.core.context.loadKoinModules
+import org.koin.core.context.startKoin
+import org.koin.core.context.stopKoin
+import org.koin.core.qualifier.named
+import org.koin.dsl.module
+import org.koin.test.AutoCloseKoinTest
 import org.koin.test.KoinTest
+import org.robolectric.annotation.LooperMode
 
 /**
  * Instrumented test, which will execute on an Android device.
@@ -62,16 +79,20 @@ import org.koin.test.KoinTest
  * See [testing documentation](http://d.android.com/tools/testing).
  */
 @RunWith(AndroidJUnit4::class)
-class FindCompanionInstrumentedTest: KoinTest {
+@LooperMode(LooperMode.Mode.PAUSED)
+class FindCompanionInstrumentedTest: AutoCloseKoinTest() {
+
+  @get:Rule
+  val grantPermissionRule: GrantPermissionRule =
+    GrantPermissionRule.grant(
+      android.Manifest.permission.CALL_PHONE)
 
   lateinit var testScenario: ActivityScenario<MainActivity>
 
   private val idlingResource = SimpleIdlingResource()
 
   companion object {
-    // 1
     val server = MockWebServer()
-    // 2
     val dispatcher: Dispatcher = object : Dispatcher() {
       @Throws(InterruptedException::class)
       override fun dispatch(request: RecordedRequest): MockResponse {
@@ -86,20 +107,17 @@ class FindCompanionInstrumentedTest: KoinTest {
     @BeforeClass
     @JvmStatic
     fun setup() {
-// 3
       server.setDispatcher(dispatcher)
       server.start()
-// 3
-      startIntent = Intent(ApplicationProvider.getApplicationContext(), MainActivity::class.java)
-      startIntent.putExtra(MainActivity.PETFINDER_URI,
-          server.url("").toString())
     }
   }
 
   private fun loadKoinTestModules() {
-    loadKoinModules(module(override = true) {
-      single<String>(name = PETFINDER_URL){server.url("").toString()}
-    }, appModule)
+    stopKoin()
+    startKoin {  }
+    loadKoinModules(listOf(module(override = true) {
+      single(named(PETFINDER_URL)){server.url("").toString()}
+    }, appModule))
   }
 
   @Subscribe
@@ -109,9 +127,9 @@ class FindCompanionInstrumentedTest: KoinTest {
 
   @Before
   fun beforeTestsRun() {
-    testScenario = ActivityScenario.launch(startIntent)
-    stopKoin()
     loadKoinTestModules()
+    testScenario = ActivityScenario.launch(MainActivity::class.java)
+
     EventBus.getDefault().register(this)
     IdlingRegistry.getInstance().register(idlingResource)
   }
@@ -121,7 +139,6 @@ class FindCompanionInstrumentedTest: KoinTest {
     // eventbus and idling resources unregister.
     IdlingRegistry.getInstance().unregister(idlingResource)
     EventBus.getDefault().unregister(this)
-    stopKoin()
     testScenario.close()
   }
 
@@ -182,6 +199,28 @@ class FindCompanionInstrumentedTest: KoinTest {
     onView(withId(R.id.noResults)).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
   }
 
+  @Test
+  fun verify_that_tapping_on_phone_number_dials_phone() {
+    // 1
+    Intents.init()
+    val intent = Intent()
+    val result =
+      Instrumentation.ActivityResult(Activity.RESULT_OK, intent)
+
+    intending(
+      allOf(
+        hasAction(Intent.ACTION_CALL)
+      )
+    ).respondWith(result)
+    // 2
+    find_and_select_kevin_in_30318()
+    onView(withText("(706) 236-4537")).perform(click())
+    // 3
+    intended(allOf(hasAction(Intent.ACTION_CALL),
+      hasData("tel:(706) 236-4537")))
+    Intents.release()
+  }
+
   private fun find_and_select_kevin_in_30318() {
     onView(withId(R.id.searchForCompanionFragment)).perform(click())
     onView(withId(R.id.searchFieldText)).perform(typeText("30318"))
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/sharedTest/java/com/raywenderlich/codingcompanionfinder/SearchForCompanionTest.kt b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/sharedTest/java/com/raywenderlich/codingcompanionfinder/SearchForCompanionTest.kt
new file mode 100644
index 0000000..71feb33
--- /dev/null
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/sharedTest/java/com/raywenderlich/codingcompanionfinder/SearchForCompanionTest.kt
@@ -0,0 +1,191 @@
+/*
+ * Copyright (c) 2021 Razeware LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * Notwithstanding the foregoing, you may not use, copy, modify, merge, publish,
+ * distribute, sublicense, create a derivative work, and/or sell copies of the
+ * Software in any work that is designed, intended, or marketed for pedagogical or
+ * instructional purposes related to programming, coding, application development,
+ * or information technology.  Permission for such use, copying, modification,
+ * merger, publication, distribution, sublicensing, creation of derivative works,
+ * or sale is expressly withheld.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package com.raywenderlich.codingcompanionfinder
+
+import androidx.fragment.app.FragmentFactory
+import androidx.fragment.app.testing.launchFragmentInContainer
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.robolectric.annotation.LooperMode
+import org.junit.runner.RunWith
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.IdlingRegistry
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.typeText
+import androidx.test.espresso.assertion.ViewAssertions
+import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import com.raywenderlich.codingcompanionfinder.searchforcompanion.SearchForCompanionFragment
+import com.raywenderlich.codingcompanionfinder.testhooks.IdlingEntity
+import okhttp3.mockwebserver.Dispatcher
+import okhttp3.mockwebserver.MockResponse
+import okhttp3.mockwebserver.MockWebServer
+import okhttp3.mockwebserver.RecordedRequest
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
+import org.junit.BeforeClass
+import org.koin.core.context.loadKoinModules
+import org.koin.core.qualifier.named
+import org.koin.dsl.module
+import org.junit.Before
+import org.junit.After
+import org.junit.Test
+import org.koin.core.context.startKoin
+import org.koin.core.context.stopKoin
+import org.koin.core.error.KoinAppAlreadyStartedException
+import org.koin.test.AutoCloseKoinTest
+import java.lang.IllegalStateException
+
+@RunWith(AndroidJUnit4::class)
+@LooperMode(LooperMode.Mode.PAUSED)
+class SearchForCompanionTest : AutoCloseKoinTest() {
+
+  private val idlingResource = SimpleIdlingResource()
+
+  companion object {
+    val server = MockWebServer()
+    val dispatcher: Dispatcher = object : Dispatcher() {
+      @Throws(InterruptedException::class)
+      override fun dispatch(
+        request: RecordedRequest
+      ): MockResponse {
+        return CommonTestDataUtil.dispatch(request) ?: MockResponse().setResponseCode(404)
+      }
+    }
+
+    @BeforeClass
+    @JvmStatic
+    fun setup() {
+      server.setDispatcher(dispatcher)
+      server.start()
+    }
+  }
+
+  private fun loadKoinTestModules(serverUrl: String){
+    loadKoinModules(listOf(module(override = true) {
+      single(named(PETFINDER_URL)) { serverUrl }
+    }))
+  }
+
+  private fun loadKoinTestModulesTryCatch(serverUrl: String) {
+    try {
+      loadKoinTestModules(serverUrl)
+    } catch (koinAlreadyStartedException: KoinAppAlreadyStartedException) {
+      stopKoin()
+      loadKoinTestModules(serverUrl)
+      loadKoinModules(listOf(module(override = true) {
+        single(named(PETFINDER_URL)) { serverUrl }
+      }))
+    } catch (illegalStateException: IllegalStateException){
+      startKoin {
+        modules(listOf(appModule))
+      }
+      loadKoinTestModules(serverUrl)
+    }
+  }
+
+  @Subscribe
+  fun onEvent(idlingEntity: IdlingEntity) {
+    idlingResource.incrementBy(idlingEntity.incrementValue)
+  }
+
+  @Before
+  fun beforeTestsRun() {
+    val serverUrl = server.url("").toString()
+    loadKoinTestModulesTryCatch(serverUrl)
+    launchFragmentInContainer<SearchForCompanionFragment>(
+      themeResId = R.style.AppTheme,
+      factory = FragmentFactory()
+    )
+    EventBus.getDefault().register(this)
+    IdlingRegistry.getInstance().register(idlingResource)
+  }
+
+  @Test
+  fun pressing_the_find_bottom_menu_item_takes_the_user_to_the_find_page() {
+    onView(withId(R.id.searchButton))
+      .check(matches(isDisplayed()))
+    onView(withId(R.id.searchFieldText))
+      .check(matches(isDisplayed()))
+    onView(withId(R.id.searchFieldText))
+      .perform(typeText("30318"))
+    onView(withId(R.id.searchButton)).perform(click())
+  }
+
+  @Test
+  fun searching_for_a_companion_in_90210_returns_no_results() {
+    onView(withId(R.id.searchFieldText))
+      .perform(typeText("90210"))
+    onView(withId(R.id.searchButton)).perform(click())
+    onView(withId(R.id.searchButton))
+      .check(matches(isDisplayed()))
+    onView(withId(R.id.noResults)).check(
+      matches(
+        withEffectiveVisibility(
+          Visibility.VISIBLE
+        )
+      )
+    )
+  }
+
+  @Test
+  fun searching_for_a_companion_in_a_call_returns_an_error_displays_no_results() {
+    onView(withId(R.id.searchFieldText)).perform(typeText("dddd"))
+    onView(withId(R.id.searchButton)).perform(click())
+    onView(withId(R.id.searchButton))
+      .check(ViewAssertions.matches(isDisplayed()))
+    onView(withId(R.id.noResults))
+      .check(ViewAssertions.matches(
+        withEffectiveVisibility(Visibility.VISIBLE)))
+  }
+
+  @Test
+  fun searching_for_a_companion_in_30318_returns_two_results() {
+    onView(withId(R.id.searchFieldText))
+      .perform(typeText("30318"))
+    onView(withId(R.id.searchButton)).perform(click())
+    onView(withId(R.id.searchButton))
+      .check(matches(isDisplayed()))
+    onView(withText("Joy")).check(matches(isDisplayed()))
+    onView(withText("Male")).check(matches(isDisplayed()))
+    onView(withText("Shih Tzu")).check(matches(isDisplayed()))
+    onView(withText("KEVIN")).check(matches(isDisplayed()))
+    onView(withText("Female")).check(matches(isDisplayed()))
+    onView(withText("Domestic Short Hair"))
+      .check(matches(isDisplayed()))
+  }
+
+  @After
+  fun afterTestsRun() {
+    // eventbus and idling resources unregister.
+    IdlingRegistry.getInstance().unregister(idlingResource)
+    EventBus.getDefault().unregister(this)
+    stopKoin()
+  }
+}
\ No newline at end of file
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/test/java/com/raywenderlich/codingcompanionfinder/ExampleUnitTest.kt b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/sharedTest/java/com/raywenderlich/codingcompanionfinder/SimpleIdlingResource.kt
similarity index 66%
rename from 18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/test/java/com/raywenderlich/codingcompanionfinder/ExampleUnitTest.kt
rename to 18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/sharedTest/java/com/raywenderlich/codingcompanionfinder/SimpleIdlingResource.kt
index 7d5327e..414c2da 100644
--- a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/test/java/com/raywenderlich/codingcompanionfinder/ExampleUnitTest.kt
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/sharedTest/java/com/raywenderlich/codingcompanionfinder/SimpleIdlingResource.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -27,21 +27,36 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-
 package com.raywenderlich.codingcompanionfinder
 
-import org.junit.Test
+import androidx.annotation.Nullable
+import androidx.test.espresso.IdlingResource
+import java.util.concurrent.atomic.AtomicInteger
 
-import org.junit.Assert.*
+class SimpleIdlingResource : IdlingResource {
 
-/**
- * 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)
+  @Nullable
+  @Volatile
+  private var callback: IdlingResource.ResourceCallback? = null
+
+  // Idleness is controlled with this boolean.
+  var activeResources = AtomicInteger(0)
+
+  override fun getName(): String {
+    return this.javaClass.name
+  }
+
+  override fun isIdleNow(): Boolean {
+    return activeResources.toInt() < 1
+  }
+
+  override fun registerIdleTransitionCallback(callback: IdlingResource.ResourceCallback) {
+    this.callback = callback
+  }
+
+  fun incrementBy(incrementValue: Int) {
+    if (activeResources.addAndGet(incrementValue) < 1 && callback != null) {
+      callback!!.onTransitionToIdle()
+    }
   }
-}
+}
\ No newline at end of file
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/sharedTest/java/com/raywenderlich/codingcompanionfinder/ViewCompanionTest.kt b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/sharedTest/java/com/raywenderlich/codingcompanionfinder/ViewCompanionTest.kt
new file mode 100644
index 0000000..ced32a9
--- /dev/null
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/sharedTest/java/com/raywenderlich/codingcompanionfinder/ViewCompanionTest.kt
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2021 Razeware LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * Notwithstanding the foregoing, you may not use, copy, modify, merge, publish,
+ * distribute, sublicense, create a derivative work, and/or sell copies of the
+ * Software in any work that is designed, intended, or marketed for pedagogical or
+ * instructional purposes related to programming, coding, application development,
+ * or information technology.  Permission for such use, copying, modification,
+ * merger, publication, distribution, sublicensing, creation of derivative works,
+ * or sale is expressly withheld.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package com.raywenderlich.codingcompanionfinder
+
+import androidx.fragment.app.testing.launchFragmentInContainer
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.raywenderlich.codingcompanionfinder.models.Address
+import com.raywenderlich.codingcompanionfinder.models.Animal
+import com.raywenderlich.codingcompanionfinder.models.Breeds
+import com.raywenderlich.codingcompanionfinder.models.Contact
+import com.raywenderlich.codingcompanionfinder.searchforcompanion.ViewCompanionFragment
+import com.raywenderlich.codingcompanionfinder.searchforcompanion.ViewCompanionFragmentArgs
+import org.robolectric.annotation.LooperMode
+import org.junit.runner.RunWith
+import org.junit.Before
+import org.junit.Test
+
+import org.junit.BeforeClass
+import java.util.regex.Pattern.matches
+
+@RunWith(AndroidJUnit4::class)
+@LooperMode(LooperMode.Mode.PAUSED)
+class ViewCompanionTest {
+
+  @Before
+  fun beforeTestsRun() {
+// 1
+    val animal = Animal(
+      22,
+      Contact(
+        phone = "404-867-5309",
+        email = "coding.companion@razware.com",
+        address = Address(
+          "",
+          "",
+          "Atlanta",
+          "GA",
+          "30303",
+          "USA"
+        )
+      ),
+      "5",
+      "small",
+      arrayListOf(),
+      Breeds("shih tzu", "", false, false),
+      "Spike",
+      "male",
+      "A sweet little guy with spikey teeth!"
+    )
+    val bundle = ViewCompanionFragmentArgs(animal).toBundle()
+    launchFragmentInContainer<ViewCompanionFragment>(bundle,
+      R.style.AppTheme)
+  }
+
+  @Test
+  fun check_that_all_values_display_correctly() {
+    onView(withText("Spike")).check(matches(isDisplayed()))
+    onView(withText("Atlanta, GA")).check(matches(isDisplayed()))
+    onView(withText("shih tzu")).check(matches(isDisplayed()))
+    onView(withText("5")).check(matches(isDisplayed()))
+    onView(withText("male")).check(matches(isDisplayed()))
+    onView(withText("small")).check(matches(isDisplayed()))
+    onView(withText("A sweet little guy with spikey teeth!"))
+      .check(matches(isDisplayed()))
+    onView(withText("404-867-5309")).check(matches(isDisplayed()))
+    onView(withText("coding.companion@razware.com"))
+      .check(matches(isDisplayed()))
+  }
+}
\ No newline at end of file
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/sharedTest/java/com/raywenderlich/codingcompanionfinder/data/AnimalData.kt b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/sharedTest/java/com/raywenderlich/codingcompanionfinder/data/AnimalData.kt
new file mode 100644
index 0000000..149a5f0
--- /dev/null
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/sharedTest/java/com/raywenderlich/codingcompanionfinder/data/AnimalData.kt
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2021 Razeware LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * Notwithstanding the foregoing, you may not use, copy, modify, merge, publish,
+ * distribute, sublicense, create a derivative work, and/or sell copies of the
+ * Software in any work that is designed, intended, or marketed for pedagogical or
+ * instructional purposes related to programming, coding, application development,
+ * or information technology.  Permission for such use, copying, modification,
+ * merger, publication, distribution, sublicensing, creation of derivative works,
+ * or sale is expressly withheld.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package com.raywenderlich.codingcompanionfinder.data
+
+import com.github.javafaker.Faker
+import com.raywenderlich.codingcompanionfinder.data.AddressData.atlantaAddress
+import com.raywenderlich.codingcompanionfinder.data.BreedsData.shihTzu
+import com.raywenderlich.codingcompanionfinder.data.ContactsData.atlantaCodingShelter
+import com.raywenderlich.codingcompanionfinder.models.Address
+import com.raywenderlich.codingcompanionfinder.models.Animal
+import com.raywenderlich.codingcompanionfinder.models.Breeds
+import com.raywenderlich.codingcompanionfinder.models.Contact
+
+val faker = Faker()
+
+val fakerAddress = Address(
+  faker.address().streetAddress(),
+  faker.address().secondaryAddress(),
+  faker.address().city(),
+  faker.address().state(),
+  faker.address().zipCode(),
+  faker.address().country()
+)
+
+val fakerBreed = Breeds(faker.cat().breed(),
+  faker.dog().breed(), faker.bool().bool(), faker.bool().bool())
+
+val fakerShelter = Contact(
+  faker.phoneNumber().cellPhone(),
+  faker.internet().emailAddress(),
+  fakerAddress
+)
+
+val fakerAnimal = Animal(
+  faker.number().digits(3).toInt(),
+  fakerShelter,
+  faker.number().digit(),
+  faker.commerce().productName(),
+  arrayListOf(),
+  fakerBreed,
+  faker.name().name(),
+  faker.dog().gender(),
+  faker.chuckNorris().fact()
+)
+
+object AnimalData {
+  val atlantaShihTzuNamedSpike = Animal(
+    22,
+    atlantaCodingShelter,
+    "5",
+    "small",
+    arrayListOf(),
+    shihTzu,
+    "Spike",
+    "male",
+    "A sweet little guy with spikey teeth!"
+  )
+}
+
+object AddressData {
+  val atlantaAddress = Address(
+    "",
+    "",
+    "Atlanta",
+    "GA",
+    "30303",
+    "USA"
+  )
+}
+
+object BreedsData {
+  val shihTzu = Breeds("shih tzu", "", false, false)
+}
+
+object ContactsData {
+  val atlantaCodingShelter = Contact(
+    phone = "404-867-5309",
+    email = "coding.companion@razware.com",
+    address = atlantaAddress
+  )
+}
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/test/java/com/raywenderlich/codingcompanionfinder/SearchForCompanionViewModelTest.kt b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/test/java/com/raywenderlich/codingcompanionfinder/SearchForCompanionViewModelTest.kt
new file mode 100644
index 0000000..7c617b2
--- /dev/null
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/test/java/com/raywenderlich/codingcompanionfinder/SearchForCompanionViewModelTest.kt
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2021 Razeware LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * Notwithstanding the foregoing, you may not use, copy, modify, merge, publish,
+ * distribute, sublicense, create a derivative work, and/or sell copies of the
+ * Software in any work that is designed, intended, or marketed for pedagogical or
+ * instructional purposes related to programming, coding, application development,
+ * or information technology.  Permission for such use, copying, modification,
+ * merger, publication, distribution, sublicensing, creation of derivative works,
+ * or sale is expressly withheld.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package com.raywenderlich.codingcompanionfinder
+
+import android.view.View.INVISIBLE
+import android.view.View.VISIBLE
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import com.raywenderlich.codingcompanionfinder.retrofit.AuthorizationInterceptor
+import com.raywenderlich.codingcompanionfinder.retrofit.PetFinderService
+import com.raywenderlich.codingcompanionfinder.searchforcompanion.SearchForCompanionViewModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.newSingleThreadContext
+import kotlinx.coroutines.test.setMain
+import okhttp3.OkHttpClient
+import okhttp3.logging.HttpLoggingInterceptor
+import okhttp3.mockwebserver.Dispatcher
+import okhttp3.mockwebserver.MockResponse
+import okhttp3.mockwebserver.MockWebServer
+import okhttp3.mockwebserver.RecordedRequest
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+
+class SearchForCompanionViewModelTest {
+
+  @get:Rule
+  val instantTaskExecutorRule = InstantTaskExecutorRule()
+
+  private val mainThreadSurrogate =
+    newSingleThreadContext("Mocked UI thread")
+
+  val server = MockWebServer()
+
+  lateinit var petFinderService: PetFinderService
+
+  val dispatcher: Dispatcher = object : Dispatcher() {
+    @Throws(InterruptedException::class)
+    override fun dispatch(
+      request: RecordedRequest
+    ): MockResponse {
+      return CommonTestDataUtil.nonInterceptedDispatch(request) ?:
+      MockResponse().setResponseCode(404)
+    }
+  }
+
+  @Before
+  fun setup() {
+    Dispatchers.setMain(mainThreadSurrogate)
+    server.setDispatcher(dispatcher)
+    server.start()
+    val logger = HttpLoggingInterceptor()
+    val client = OkHttpClient.Builder()
+      .addInterceptor(logger)
+      .connectTimeout(60L, TimeUnit.SECONDS)
+      .readTimeout(60L, TimeUnit.SECONDS)
+      .build()
+    petFinderService = Retrofit.Builder()
+      .baseUrl(server.url("").toString())
+      .addConverterFactory(GsonConverterFactory.create())
+      .client(client)
+      .build().create(PetFinderService::class.java)
+  }
+
+  // 4
+  @Test
+  fun call_to_searchForCompanions_gets_results() {
+    val searchForCompanionViewModel =
+      SearchForCompanionViewModel(petFinderService)
+    searchForCompanionViewModel.companionLocation.value = "30318"
+// 1
+    val countDownLatch = CountDownLatch(1)
+    searchForCompanionViewModel.searchForCompanions()
+// 2
+    searchForCompanionViewModel.animals.observeForever {
+      countDownLatch.countDown()
+    }
+// 3
+    countDownLatch.await(2, TimeUnit.SECONDS)
+    Assert.assertEquals(2,
+      searchForCompanionViewModel.animals.value!!.size)
+  }
+
+  fun callSearchForCompanionWithALocationAndWaitForVisibilityResult(location: String): SearchForCompanionViewModel{
+    val searchForCompanionViewModel =
+      SearchForCompanionViewModel(petFinderService)
+    searchForCompanionViewModel.companionLocation.value = location
+    val countDownLatch = CountDownLatch(1)
+    searchForCompanionViewModel.searchForCompanions()
+    searchForCompanionViewModel.noResultsViewVisiblity
+      .observeForever {
+        countDownLatch.countDown()
+      }
+
+    countDownLatch.await(2, TimeUnit.SECONDS)
+    return searchForCompanionViewModel
+  }
+
+  @Test
+  fun call_to_searchForCompanions_with_results_sets_the_visibility_of_no_results_to_INVISIBLE() {
+    val searchForCompanionViewModel = callSearchForCompanionWithALocationAndWaitForVisibilityResult("30318")
+    Assert.assertEquals(INVISIBLE,
+      searchForCompanionViewModel.noResultsViewVisiblity.value)
+  }
+
+  @Test
+  fun call_to_searchForCompanions_with_no_results_sets_the_visibility_of_no_results_to_VISIBLE() {
+    val searchForCompanionViewModel = callSearchForCompanionWithALocationAndWaitForVisibilityResult("90210")
+    Assert.assertEquals(VISIBLE,
+      searchForCompanionViewModel.noResultsViewVisiblity.value)
+  }
+}
\ No newline at end of file
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/test/java/com/raywenderlich/codingcompanionfinder/ExampleUnitTest.kt b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/test/java/com/raywenderlich/codingcompanionfinder/ViewCompanionViewModelTest.kt
similarity index 52%
rename from 18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/test/java/com/raywenderlich/codingcompanionfinder/ExampleUnitTest.kt
rename to 18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/test/java/com/raywenderlich/codingcompanionfinder/ViewCompanionViewModelTest.kt
index 7d5327e..33a9384 100644
--- a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/test/java/com/raywenderlich/codingcompanionfinder/ExampleUnitTest.kt
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/app/src/test/java/com/raywenderlich/codingcompanionfinder/ViewCompanionViewModelTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -30,18 +30,53 @@
 
 package com.raywenderlich.codingcompanionfinder
 
+import com.raywenderlich.codingcompanionfinder.data.AnimalData.atlantaShihTzuNamedSpike
+import com.raywenderlich.codingcompanionfinder.data.fakerAnimal
+import com.raywenderlich.codingcompanionfinder.models.Address
+import com.raywenderlich.codingcompanionfinder.models.Animal
+import com.raywenderlich.codingcompanionfinder.models.Breeds
+import com.raywenderlich.codingcompanionfinder.models.Contact
+import com.raywenderlich.codingcompanionfinder.searchforcompanion.ViewCompanionViewModel
 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 {
+class ViewCompanionViewModelTest {
+  val animal = Animal(
+    22,
+    Contact(
+      phone = "404-867-5309",
+      email = "coding.companion@razware.com",
+      address = Address(
+        "",
+        "",
+        "Atlanta",
+        "GA",
+        "30303",
+        "USA"
+      ) ),
+    "5",
+    "small",
+    arrayListOf(),
+    Breeds("shih tzu", "", false, false),
+    "Spike",
+    "male",
+    "A sweet little guy with spikey teeth!"
+  )
+  @Test
+  fun populateFromAnimal_sets_the_animals_name_to_the_view_model() {
+    val viewCompanionViewModel = ViewCompanionViewModel()
+    viewCompanionViewModel
+      .populateFromAnimal(atlantaShihTzuNamedSpike)
+    assert(viewCompanionViewModel.name
+      .equals(atlantaShihTzuNamedSpike.name))
+  }
+
   @Test
-  fun addition_isCorrect() {
-    assertEquals(4, 2 + 2)
+  fun populateFromAnimal_sets_the_animals_description_to_the_view_model(){
+    val viewCompanionViewModel = ViewCompanionViewModel()
+    System.out.println(fakerAnimal.toString())
+    viewCompanionViewModel.populateFromAnimal(fakerAnimal)
+    assertEquals(fakerAnimal.description, viewCompanionViewModel.description)
   }
 }
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/build.gradle b/18-testing-around-other-components/projects/final/CodingCompanionFinder/build.gradle
index 972d15f..fbe1b82 100644
--- a/18-testing-around-other-components/projects/final/CodingCompanionFinder/build.gradle
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/build.gradle
@@ -1,15 +1,15 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.5.0'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:4.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.1.0-rc01"
+        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.3.5"
 
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/gradle/wrapper/gradle-wrapper.jar b/18-testing-around-other-components/projects/final/CodingCompanionFinder/gradle/wrapper/gradle-wrapper.jar
index 5c2d1cf..f6b961f 100644
Binary files a/18-testing-around-other-components/projects/final/CodingCompanionFinder/gradle/wrapper/gradle-wrapper.jar and b/18-testing-around-other-components/projects/final/CodingCompanionFinder/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/gradle/wrapper/gradle-wrapper.properties b/18-testing-around-other-components/projects/final/CodingCompanionFinder/gradle/wrapper/gradle-wrapper.properties
index 0b27fce..8ba38f1 100644
--- a/18-testing-around-other-components/projects/final/CodingCompanionFinder/gradle/wrapper/gradle-wrapper.properties
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Sep 03 20:07:17 CDT 2019
+#Wed Jun 16 22:40:20 EDT 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip
+zipStoreBase=GRADLE_USER_HOME
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/gradlew b/18-testing-around-other-components/projects/final/CodingCompanionFinder/gradlew
index 8e25e6c..cccdd3d 100755
--- a/18-testing-around-other-components/projects/final/CodingCompanionFinder/gradlew
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/gradlew
@@ -1,21 +1,5 @@
 #!/usr/bin/env sh
 
-#
-# Copyright 2015 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -44,7 +28,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+DEFAULT_JVM_OPTS=""
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
diff --git a/18-testing-around-other-components/projects/final/CodingCompanionFinder/gradlew.bat b/18-testing-around-other-components/projects/final/CodingCompanionFinder/gradlew.bat
index 9618d8d..e95643d 100644
--- a/18-testing-around-other-components/projects/final/CodingCompanionFinder/gradlew.bat
+++ b/18-testing-around-other-components/projects/final/CodingCompanionFinder/gradlew.bat
@@ -1,100 +1,84 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/build.gradle b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/build.gradle
index b571792..c2c6c5b 100644
--- a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/build.gradle
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/build.gradle
@@ -9,11 +9,11 @@ apply plugin: 'kotlin-kapt'
 apply plugin: "androidx.navigation.safeargs.kotlin"
 
 android {
-  compileSdkVersion 28
+  compileSdkVersion 30
   defaultConfig {
     applicationId "com.raywenderlich.codingcompanionfinder"
     minSdkVersion 21
-    targetSdkVersion 28
+    targetSdkVersion 30
     versionCode 1
     versionName "1.0"
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -27,17 +27,34 @@ android {
   dataBinding {
     enabled = true
   }
+
+  sourceSets {
+    String sharedTestDir = 'src/sharedTest/java'
+    String sharedResources = 'src/sharedTest/assets'
+    test {
+      java.srcDirs += sharedTestDir
+      resources.srcDirs += sharedResources
+    }
+    androidTest {
+      java.srcDirs += sharedTestDir
+      resources.srcDirs += sharedResources
+    }
+  }
+
+  testOptions {
+    unitTests.includeAndroidResources = true
+    unitTests.returnDefaultValues = true
+  }
 }
 
 dependencies {
   // android stuff
   implementation fileTree(dir: 'libs', include: ['*.jar'])
-  implementation 'com.google.android.material:material:1.0.0'
-  implementation "com.android.support:design:28.0.0"
-  implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
-  implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2'
-  implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.1'
-  implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.1.1'
+  implementation 'com.google.android.material:material:1.3.0'
+  implementation 'androidx.appcompat:appcompat:1.3.0'
+  implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+  implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_version"
+  implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_version"
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
   implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 
@@ -46,47 +63,67 @@ dependencies {
   implementation "android.arch.navigation:navigation-fragment-ktx:1.0.0" // use -ktx for
 
   // Glide
-  implementation("com.github.bumptech.glide:glide:4.8.0") {
+  implementation("com.github.bumptech.glide:glide:4.12.0") {
     exclude group: "com.android.support"
   }
-  kapt 'com.github.bumptech.glide:compiler:4.8.0'
+  kapt 'com.github.bumptech.glide:compiler:4.12.0'
 
   // carouselview library
   implementation "com.synnapps:carouselview:0.1.5"
 
   // retrofit
-  implementation "com.squareup.okhttp3:logging-interceptor:3.11.0"
-  implementation 'com.squareup.retrofit2:retrofit:2.5.0'
-  implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
-  implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2'
+  implementation "com.squareup.okhttp3:logging-interceptor:3.14.9"
+  implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+  implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
 
   // eventbus
   implementation 'org.greenrobot:eventbus:3.1.1'
 
   // Architecture components
-  def lifecycle_version = "2.0.0"
+  def lifecycle_version = "2.2.0"
   implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
   kapt "androidx.lifecycle:lifecycle-compiler:$lifecycle_version"
 
   // Koin
-  implementation 'org.koin:koin-android-viewmodel:1.0.1'
-  androidTestImplementation 'org.koin:koin-test:1.0.1'
+  implementation 'org.koin:koin-android-viewmodel:2.0.1'
+  androidTestImplementation 'org.koin:koin-test:2.0.1'
 
   // permissions
-  implementation 'com.karumi:dexter:5.0.0'
+  implementation 'com.karumi:dexter:6.0.0'
+
+  def coroutinesVersion = "1.5.0"
 
   // testing dependencies
-  testImplementation 'junit:junit:4.12'
-  androidTestImplementation 'androidx.test:runner:1.2.0'
-  androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-  androidTestImplementation "androidx.test:rules:1.2.0"
-  androidTestImplementation "androidx.test.ext:junit:1.1.1"
-  androidTestImplementation "android.arch.navigation:navigation-testing:1.0.0-alpha08"
+  testImplementation 'junit:junit:4.13.2'
+  testImplementation 'androidx.test:runner:1.3.0'
+  testImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+  testImplementation "androidx.test:rules:1.3.0"
+  testImplementation "androidx.test.ext:junit:1.1.2"
+  testImplementation "androidx.navigation:navigation-testing:2.3.5"
+  testImplementation 'com.squareup.okhttp3:mockwebserver:3.12.0'
+  testImplementation "androidx.test.espresso:espresso-contrib:3.3.0"
+  testImplementation 'org.robolectric:robolectric:4.5.1'
+  testImplementation 'org.koin:koin-test:2.0.1'
+  testImplementation "androidx.arch.core:core-testing:2.1.0"
+  testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
+  testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion"
+  testImplementation 'com.github.javafaker:javafaker:0.18'
+
+// Once https://issuetracker.google.com/127986458 is fixed this can be testImplementation
+// fragmentscenario testing
+  debugImplementation 'androidx.fragment:fragment-testing:1.3.4'
+  debugImplementation "androidx.test:core:1.3.0"
+
+  androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
+  androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion"
+  androidTestImplementation "androidx.arch.core:core-testing:2.1.0"
+  androidTestImplementation "org.robolectric:annotations:4.5.1"
+  androidTestImplementation 'androidx.test:runner:1.3.0'
+  androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+  androidTestImplementation "androidx.test:rules:1.3.0"
+  androidTestImplementation "androidx.test.ext:junit:1.1.2"
+  androidTestImplementation "androidx.navigation:navigation-testing:2.3.5"
   androidTestImplementation 'com.squareup.okhttp3:mockwebserver:3.12.0'
-  androidTestImplementation "androidx.test.espresso:espresso-contrib:3.2.0"
-
-  // Once https://issuetracker.google.com/127986458 is fixed this can betestImplementation
-  // fragmentscenario testing
-  debugImplementation 'androidx.fragment:fragment-testing:1.1.0-rc04'
-  debugImplementation "androidx.test:core:1.2.0"
+  androidTestImplementation "androidx.test.espresso:espresso-contrib:3.3.0"
+  androidTestImplementation 'com.github.javafaker:javafaker:0.18'
 }
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/androidTest/java/.gitkeep b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/androidTest/java/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/androidTest/java/com/raywenderlich/codingcompanionfinder/.gitkeep b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/androidTest/java/com/raywenderlich/codingcompanionfinder/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/androidTest/java/com/raywenderlich/codingcompanionfinder/ViewCompanionTest.kt b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/androidTest/java/com/raywenderlich/codingcompanionfinder/ViewCompanionTest.kt
deleted file mode 100644
index f86abb4..0000000
--- a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/androidTest/java/com/raywenderlich/codingcompanionfinder/ViewCompanionTest.kt
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.raywenderlich.codingcompanionfinder
-
-import androidx.fragment.app.testing.launchFragmentInContainer
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.assertion.ViewAssertions.matches
-import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
-import androidx.test.espresso.matcher.ViewMatchers.withText
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.raywenderlich.codingcompanionfinder.models.Address
-import com.raywenderlich.codingcompanionfinder.models.Animal
-import com.raywenderlich.codingcompanionfinder.models.Breeds
-import com.raywenderlich.codingcompanionfinder.models.Contact
-import com.raywenderlich.codingcompanionfinder.searchforcompanion.ViewCompanionFragment
-import com.raywenderlich.codingcompanionfinder.searchforcompanion.ViewCompanionFragmentArgs
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class ViewCompanionTest {
-
-  @Before
-  fun beforeTestsRun() {
-// 1
-    val animal = Animal(
-      22,
-      Contact(
-        phone = "(706) 236-4537",
-        email = "coding.companion@razware.com",
-        address = Address(
-          "",
-          "",
-          "Atlanta",
-          "GA",
-          "30303",
-          "USA"
-        )
-      ),
-      "5",
-      "small",
-      arrayListOf(),
-      Breeds("shih tzu", "", false, false),
-      "Spike",
-      "male",
-      "A sweet little guy with spikey teeth!"
-    )
-// 2
-    val bundle = ViewCompanionFragmentArgs(animal).toBundle()
-// 3
-    launchFragmentInContainer<ViewCompanionFragment>(
-      bundle,
-      R.style.AppTheme
-    )
-  }
-
-  @Test
-  fun check_that_all_values_display_correctly() {
-    onView(withText("Spike")).check(matches(isDisplayed()))
-    onView(withText("Atlanta, GA")).check(matches(isDisplayed()))
-    onView(withText("shih tzu")).check(matches(isDisplayed()))
-    onView(withText("5")).check(matches(isDisplayed()))
-    onView(withText("male")).check(matches(isDisplayed()))
-    onView(withText("small")).check(matches(isDisplayed()))
-    onView(withText("A sweet little guy with spikey teeth!")).check(matches(isDisplayed()))
-    onView(withText("(706) 236-4537")).check(matches(isDisplayed()))
-    onView(withText("coding.companion@razware.com")).check(matches(isDisplayed()))
-  }
-
-}
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/androidTest/resources/mockito-extensions/org.mockito.plugins.MockMaker b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/androidTest/resources/mockito-extensions/org.mockito.plugins.MockMaker
deleted file mode 100644
index 1f0955d..0000000
--- a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/androidTest/resources/mockito-extensions/org.mockito.plugins.MockMaker
+++ /dev/null
@@ -1 +0,0 @@
-mock-maker-inline
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/CodingCompanionFinder.kt b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/CodingCompanionFinder.kt
index 8fe750d..6a29144 100644
--- a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/CodingCompanionFinder.kt
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/CodingCompanionFinder.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -30,11 +30,21 @@
 package com.raywenderlich.codingcompanionfinder
 
 import android.app.Application
-import org.koin.android.ext.android.startKoin
+import android.util.Log
+import org.koin.android.ext.koin.androidContext
+import org.koin.core.context.startKoin
+import org.koin.core.error.KoinAppAlreadyStartedException
 
-class CodingCompanionFinder: Application(){
+class CodingCompanionFinder : Application() {
   override fun onCreate() {
     super.onCreate()
-    startKoin(this, listOf(appModule, urlsModule))
+    try {
+      startKoin {
+        androidContext(this@CodingCompanionFinder)
+        modules(listOf(appModule, urlsModule))
+      }
+    } catch (koinAlreadyStartedException: KoinAppAlreadyStartedException) {
+      Log.i("CodingCompanionFinder", "KoinAppAlreadyStartedException, should only happen in tests")
+    }
   }
 }
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/CodingCompanionGlideModule.kt b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/CodingCompanionGlideModule.kt
index 79ab31d..2299c1b 100644
--- a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/CodingCompanionGlideModule.kt
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/CodingCompanionGlideModule.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/KoinModule.kt b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/KoinModule.kt
index 006310f..e57cec4 100644
--- a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/KoinModule.kt
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/KoinModule.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -29,22 +29,22 @@
  */
 package com.raywenderlich.codingcompanionfinder
 
-import com.jakewharton.retrofit2.adapter.kotlin.coroutines.CoroutineCallAdapterFactory
 import com.raywenderlich.codingcompanionfinder.retrofit.AuthorizationInterceptor
 import com.raywenderlich.codingcompanionfinder.retrofit.PetFinderService
 import com.raywenderlich.codingcompanionfinder.searchforcompanion.SearchForCompanionViewModel
 import com.raywenderlich.codingcompanionfinder.searchforcompanion.ViewCompanionViewModel
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
-import org.koin.android.viewmodel.ext.koin.viewModel
-import org.koin.dsl.module.module
+import org.koin.android.viewmodel.dsl.viewModel
+import org.koin.core.qualifier.named
+import org.koin.dsl.module
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import java.util.concurrent.TimeUnit
 
 const val PETFINDER_URL = "PETFINDER_URL"
 val urlsModule = module {
-  single(name = PETFINDER_URL){MainActivity.DEFAULT_PETFINDER_URL}
+  single(named(PETFINDER_URL)){MainActivity.DEFAULT_PETFINDER_URL}
 }
 val appModule = module {
   single<PetFinderService> {
@@ -56,9 +56,8 @@ val appModule = module {
       .addInterceptor(AuthorizationInterceptor())
       .build()
     Retrofit.Builder()
-      .baseUrl(get(PETFINDER_URL) as String)
+      .baseUrl(get<String>(named(PETFINDER_URL)))
       .addConverterFactory(GsonConverterFactory.create())
-      .addCallAdapterFactory(CoroutineCallAdapterFactory())
       .client(client)
       .build().create(PetFinderService::class.java)
   }
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/MainActivity.kt b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/MainActivity.kt
index 601705f..abdd22b 100644
--- a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/MainActivity.kt
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/MainActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -35,7 +35,6 @@ import android.os.Bundle
 import androidx.navigation.Navigation
 import androidx.navigation.ui.NavigationUI
 import com.google.android.material.bottomnavigation.BottomNavigationView
-import com.jakewharton.retrofit2.adapter.kotlin.coroutines.CoroutineCallAdapterFactory
 import com.raywenderlich.codingcompanionfinder.retrofit.AuthorizationInterceptor
 import com.raywenderlich.codingcompanionfinder.retrofit.PetFinderService
 import com.raywenderlich.codingcompanionfinder.testhooks.IdlingEntity
@@ -72,7 +71,6 @@ class MainActivity : AppCompatActivity() {
       petFinderService = Retrofit.Builder()
         .baseUrl(baseUrl)
         .addConverterFactory(GsonConverterFactory.create())
-        .addCallAdapterFactory(CoroutineCallAdapterFactory())
         .client(client)
         .build().create(PetFinderService::class.java)
     }
@@ -110,8 +108,8 @@ class MainActivity : AppCompatActivity() {
   companion object {
     val PETFINDER_URI = "petfinder_uri"
     val PETFINDER_KEY = "petfinder_key"
-    val API_KEY = "your_key"
-    val API_SECRET = "your_secret"
+    val API_KEY = "your_api_key"
+    val API_SECRET = "your_api_secret"
     val DEFAULT_PETFINDER_URL = "https://api.petfinder.com/v2/"
   }
 }
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/SplashActivity.kt b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/SplashActivity.kt
index e151326..739afdc 100644
--- a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/SplashActivity.kt
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/SplashActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Address.kt b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Address.kt
index 0b55dde..e262d1a 100644
--- a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Address.kt
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Address.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -30,8 +30,6 @@
 
 package com.raywenderlich.codingcompanionfinder.models
 
-import java.io.Serializable
-
 data class Address(
   val address1: String,
   val address2: String,
@@ -39,4 +37,4 @@ data class Address(
   val state: String,
   val postcode: String,
   val country: String
-): Serializable
+)
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Animal.kt b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Animal.kt
index c03a383..9574b81 100644
--- a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Animal.kt
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Animal.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/AnimalResult.kt b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/AnimalResult.kt
index 4a96587..f34a726 100644
--- a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/AnimalResult.kt
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/AnimalResult.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Breeds.kt b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Breeds.kt
index 9d37fb6..f2a0a09 100644
--- a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Breeds.kt
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Breeds.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -30,11 +30,9 @@
 
 package com.raywenderlich.codingcompanionfinder.models
 
-import java.io.Serializable
-
 data class Breeds(
     val primary: String,
     val secondary: String,
     val mixed: Boolean,
     val unknown: Boolean
-) : Serializable
+)
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Contact.kt b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Contact.kt
index d5020a3..9513ea1 100644
--- a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Contact.kt
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Contact.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -30,10 +30,8 @@
 
 package com.raywenderlich.codingcompanionfinder.models
 
-import java.io.Serializable
-
 data class Contact(
   val phone: String = "",
   val email: String = "",
   val address: Address
-) : Serializable
+)
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Photo.kt b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Photo.kt
index 64192fb..4405590 100644
--- a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Photo.kt
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Photo.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -30,12 +30,10 @@
 
 package com.raywenderlich.codingcompanionfinder.models
 
-import java.io.Serializable
-
 data class Photo(
     val small: String = "",
     val medium: String = "",
     val large: String = "",
     val xlarge: String = "",
     val full: String = ""
-) : Serializable
+)
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Token.kt b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Token.kt
index 57dd581..8e60b13 100644
--- a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Token.kt
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/models/Token.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/randomcompanion/RandomCompanionFragment.kt b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/randomcompanion/RandomCompanionFragment.kt
index be596ba..3ab9f7c 100644
--- a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/randomcompanion/RandomCompanionFragment.kt
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/randomcompanion/RandomCompanionFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -43,7 +43,6 @@ import com.raywenderlich.codingcompanionfinder.MainActivity
 import com.raywenderlich.codingcompanionfinder.R
 import com.raywenderlich.codingcompanionfinder.models.Animal
 import com.synnapps.carouselview.CarouselView
-import com.synnapps.carouselview.ViewListener
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
@@ -70,8 +69,7 @@ class RandomCompanionFragment : Fragment() {
       key = (activity as MainActivity).accessToken
       (activity as MainActivity).petFinderService?.let { petFinderService ->
 
-        val animalsRequest = petFinderService.getAnimals((activity as MainActivity).accessToken, 1)
-        val animalsResponse = animalsRequest.await()
+        val animalsResponse = petFinderService.getAnimals((activity as MainActivity).accessToken, 1)
         if (animalsResponse.isSuccessful) {
           animalsResponse.body()?.let {animalResult ->
             if (animalResult.animals.size > 0) {
@@ -114,17 +112,14 @@ class RandomCompanionFragment : Fragment() {
 
     view?.let {
       petCaroselView = it.findViewById(R.id.petCarouselView)
-      petCaroselView.setViewListener(object : ViewListener {
-
-        override fun setViewForPosition(position: Int): View {
-          val carouselItemView = layoutInflater.inflate(R.layout.companion_photo_layout, null)
-          val imageView = carouselItemView.findViewById<ImageView>(R.id.petImage)
-          GlideApp.with(randomCompanionFragment).load(petPhotos[position])
-              .fitCenter()
-              .into(imageView)
-          return carouselItemView
-        }
-      })
+      petCaroselView.setViewListener { position ->
+        val carouselItemView = layoutInflater.inflate(R.layout.companion_photo_layout, null)
+        val imageView = carouselItemView.findViewById<ImageView>(R.id.petImage)
+        GlideApp.with(randomCompanionFragment).load(petPhotos[position])
+          .fitCenter()
+          .into(imageView)
+        carouselItemView
+      }
       petCaroselView.pageCount = petPhotos.size
     }
   }
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/retrofit/AuthorizationInterceptor.kt b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/retrofit/AuthorizationInterceptor.kt
index 569cfc5..4309ae8 100644
--- a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/retrofit/AuthorizationInterceptor.kt
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/retrofit/AuthorizationInterceptor.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -34,8 +34,8 @@ import com.raywenderlich.codingcompanionfinder.MainActivity
 import com.raywenderlich.codingcompanionfinder.models.Token
 import okhttp3.Interceptor
 import okhttp3.Response
-import org.koin.standalone.KoinComponent
-import org.koin.standalone.inject
+import org.koin.core.KoinComponent
+import org.koin.core.inject
 import java.io.IOException
 
 // 1
@@ -53,13 +53,14 @@ class AuthorizationInterceptor : Interceptor, KoinComponent {
       val tokenRequest = petFinderService.getToken(clientId =
       MainActivity.API_KEY, clientSecret = MainActivity.API_SECRET)
       val tokenResponse = tokenRequest.execute()
-      if (tokenResponse.isSuccessful()) {
+      if (tokenResponse.isSuccessful) {
         tokenResponse.body()?.let {
           token = it
           val builder =
             mainRequest.newBuilder().header("Authorization", "Bearer " +
                 it.accessToken)
               .method(mainRequest.method(), mainRequest.body())
+          mainResponse.close()
           mainResponse = chain.proceed(builder.build())
         } }
     }
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/retrofit/PetFinderService.kt b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/retrofit/PetFinderService.kt
index 777e324..7ae6826 100644
--- a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/retrofit/PetFinderService.kt
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/retrofit/PetFinderService.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -31,7 +31,6 @@
 package com.raywenderlich.codingcompanionfinder.retrofit
 
 import com.raywenderlich.codingcompanionfinder.models.*
-import kotlinx.coroutines.Deferred
 import retrofit2.Call
 import retrofit2.Response
 import retrofit2.http.*
@@ -46,9 +45,9 @@ interface PetFinderService {
       @Field("client_secret") clientSecret: String): Call<Token>
 
   @GET("animals")
-  fun getAnimals(
+  suspend fun getAnimals(
       @Header("Authorization")  accessToken: String,
       @Query("limit") limit: Int = 20,
       @Query("location") location: String? = null
-  ) : Deferred<Response<AnimalResult>>
+  ) : Response<AnimalResult>
 }
\ No newline at end of file
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/CompanionAdapter.kt b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/CompanionAdapter.kt
index e717f45..fb0cf14 100644
--- a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/CompanionAdapter.kt
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/CompanionAdapter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/CompanionViewHolder.kt b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/CompanionViewHolder.kt
index 022e59a..01a55fb 100644
--- a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/CompanionViewHolder.kt
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/CompanionViewHolder.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -30,7 +30,6 @@
 
 package com.raywenderlich.codingcompanionfinder.searchforcompanion
 
-import android.os.Bundle
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/SearchForCompanionFragment.kt b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/SearchForCompanionFragment.kt
index f84ea4a..e06a497 100644
--- a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/SearchForCompanionFragment.kt
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/SearchForCompanionFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -34,28 +34,14 @@ import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
-import android.view.View.INVISIBLE
-import android.view.View.VISIBLE
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.button.MaterialButton
-import com.google.android.material.textfield.TextInputEditText
 import com.raywenderlich.codingcompanionfinder.MainActivity
 
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
 import android.view.inputmethod.InputMethodManager
-import android.widget.TextView
-import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModelProviders
-import com.raywenderlich.codingcompanionfinder.R
 import com.raywenderlich.codingcompanionfinder.databinding.FragmentSearchForCompanionBinding
-import com.raywenderlich.codingcompanionfinder.models.Animal
-import com.raywenderlich.codingcompanionfinder.testhooks.IdlingEntity
-import org.greenrobot.eventbus.EventBus
 import org.koin.android.viewmodel.ext.android.viewModel
 
 class SearchForCompanionFragment : Fragment() {
@@ -83,31 +69,24 @@ class SearchForCompanionFragment : Fragment() {
   }
 
   override fun onActivityCreated(savedInstanceState: Bundle?) {
-// 1
     fragmentSearchForCompanionBinding.searchButton.setOnClickListener {
       try {
         val inputMethodManager =
             activity?.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager?
         inputMethodManager!!.hideSoftInputFromWindow(
-            activity?.getCurrentFocus()?.getWindowToken(),
+            activity?.currentFocus?.windowToken,
             0
         )
       } catch (e: Exception) {
         // only happens when the keyboard is already closed
       }
-// 2
       searchForCompanionViewModel.searchForCompanions()
     }
-// 3
     setupSearchForCompanions()
     super.onActivityCreated(savedInstanceState)
   }
 
   private fun setupSearchForCompanions() {
-// 1
-    searchForCompanionViewModel.accessToken = (activity as
-        MainActivity).accessToken
-// 2
     viewManager = LinearLayoutManager(context)
     companionAdapter =
         CompanionAdapter(searchForCompanionViewModel.animals.value ?: arrayListOf(), this)
@@ -116,12 +95,11 @@ class SearchForCompanionFragment : Fragment() {
           layoutManager = viewManager
           adapter = companionAdapter
         }
-// 3
-    searchForCompanionViewModel.animals.observe(this,
-        Observer<ArrayList<Animal>?> {
-          companionAdapter.animals = it ?: arrayListOf()
-          companionAdapter.notifyDataSetChanged()
-        })
+    searchForCompanionViewModel.animals.observe(viewLifecycleOwner,
+      {
+        companionAdapter.animals = it ?: arrayListOf()
+        companionAdapter.notifyDataSetChanged()
+      })
   }
 
 }
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/SearchForCompanionViewModel.kt b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/SearchForCompanionViewModel.kt
index fa098cb..524918b 100644
--- a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/SearchForCompanionViewModel.kt
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/SearchForCompanionViewModel.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -42,41 +42,34 @@ import kotlinx.coroutines.launch
 import org.greenrobot.eventbus.EventBus
 
 class SearchForCompanionViewModel(val petFinderService: PetFinderService): ViewModel() {
-  val noResultsViewVisiblity : MutableLiveData<Int> = MutableLiveData<Int>().apply { INVISIBLE}
+  val noResultsViewVisiblity : MutableLiveData<Int> = MutableLiveData<Int>()
   val companionLocation : MutableLiveData<String> = MutableLiveData()
 
-  // 1
-  val animals: MutableLiveData<ArrayList<Animal>> = MutableLiveData<ArrayList<Animal>>().apply { arrayListOf<Animal>() }
-  lateinit var accessToken: String
+  val animals: MutableLiveData<ArrayList<Animal>> = MutableLiveData<ArrayList<Animal>>()
+  var accessToken: String = ""
 
   fun searchForCompanions() {
 
     GlobalScope.launch {
 
       EventBus.getDefault().post(IdlingEntity(1))
-// 2
-      val getAnimalsRequest = petFinderService.getAnimals(
+      val searchForPetResponse = petFinderService.getAnimals(
           accessToken,
           location = companionLocation.value
       )
 
-      val searchForPetResponse = getAnimalsRequest.await()
-
       GlobalScope.launch(Dispatchers.Main) {
         if (searchForPetResponse.isSuccessful) {
           searchForPetResponse.body()?.let {
             // 3
             animals.postValue(it.animals)
             if (it.animals.size > 0) {
-// 3
               noResultsViewVisiblity.postValue(INVISIBLE)
             } else {
-// 3
               noResultsViewVisiblity.postValue(View.VISIBLE)
             }
           }
         } else {
-// 3
           noResultsViewVisiblity.postValue(View.VISIBLE)
         }
       }
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/ViewCompanionFragment.kt b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/ViewCompanionFragment.kt
index b5fb8a8..f749a76 100644
--- a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/ViewCompanionFragment.kt
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/ViewCompanionFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -39,11 +39,14 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
-import android.widget.TextView
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProviders
+import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.fragment.navArgs
 import com.karumi.dexter.Dexter
+import com.karumi.dexter.PermissionToken
+import com.karumi.dexter.listener.PermissionDeniedResponse
+import com.karumi.dexter.listener.PermissionGrantedResponse
+import com.karumi.dexter.listener.PermissionRequest
 import com.karumi.dexter.listener.single.PermissionListener
 import com.raywenderlich.codingcompanionfinder.GlideApp
 
@@ -51,101 +54,98 @@ import com.raywenderlich.codingcompanionfinder.R
 import com.raywenderlich.codingcompanionfinder.databinding.FragmentViewCompanionBinding
 import com.raywenderlich.codingcompanionfinder.models.Animal
 import com.synnapps.carouselview.CarouselView
-import com.synnapps.carouselview.ViewListener
-import com.karumi.dexter.PermissionToken
-import com.karumi.dexter.listener.PermissionDeniedResponse
-import com.karumi.dexter.listener.PermissionGrantedResponse
-import com.karumi.dexter.listener.PermissionRequest
-
 
 class ViewCompanionFragment : Fragment() {
-  companion object {
-    val ANIMAL: String = "ANIMAL"
-  }
 
-  private lateinit var animal: Animal
-  private lateinit var petPhotos: ArrayList<String>
-  private lateinit var petCaroselView: CarouselView
-  private lateinit var viewCompanionFragment: ViewCompanionFragment
-  private lateinit var fragmentViewCompanionBinding: FragmentViewCompanionBinding
-  private lateinit var viewCompanionViewModel: ViewCompanionViewModel
+    companion object {
+        val ANIMAL: String = "ANIMAL"
+    }
 
-  val args: ViewCompanionFragmentArgs by navArgs()
-  override fun onCreateView(
-    inflater: LayoutInflater, container: ViewGroup?,
-    savedInstanceState: Bundle?
-  ): View? {
-    animal = args.animal
-    viewCompanionFragment = this
-    // 1
-    fragmentViewCompanionBinding =
-      FragmentViewCompanionBinding.inflate(inflater, container, false)
-    // 2
-    viewCompanionViewModel = ViewModelProviders.of(this).get(ViewCompanionViewModel::class.java)
+    private lateinit var animal: Animal
+    private lateinit var petPhotos: ArrayList<String>
+    private lateinit var petCaroselView: CarouselView
+    private lateinit var viewCompanionFragment: ViewCompanionFragment
+    private lateinit var fragmentViewCompanionBinding: FragmentViewCompanionBinding
+    private lateinit var viewCompanionViewModel: ViewCompanionViewModel
+
+    val args: ViewCompanionFragmentArgs by navArgs()
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        animal = args.animal
+        viewCompanionFragment = this
+        // 1
+        fragmentViewCompanionBinding = FragmentViewCompanionBinding.inflate(inflater, container, false)
+        // 2
+        viewCompanionViewModel = ViewModelProvider(this).get(ViewCompanionViewModel::class.java)
 // 3
-    viewCompanionViewModel.populateFromAnimal(animal)
+        viewCompanionViewModel.populateFromAnimal(animal)
 // 4
-    fragmentViewCompanionBinding.viewCompanionViewModel =
-      viewCompanionViewModel
+        fragmentViewCompanionBinding.viewCompanionViewModel =
+            viewCompanionViewModel
 // 5
-
-    setupPhonNumberOnClick()
-    return fragmentViewCompanionBinding.root
-  }
-
-  override fun onResume() {
-    populatePhotos()
-    super.onResume()
-  }
-
-  private fun populatePhotos() {
-    petPhotos = ArrayList()
-    animal.photos.forEach { photo ->
-      petPhotos.add(photo.full)
+        setupPhonNumberOnClick()
+        return fragmentViewCompanionBinding.root
     }
 
-    view?.let {
-      petCaroselView = it.findViewById(R.id.petCarouselView)
-      petCaroselView.setViewListener(object : ViewListener {
-
-        override fun setViewForPosition(position: Int): View {
-          val carouselItemView = layoutInflater.inflate(R.layout.companion_photo_layout, null)
-          val imageView = carouselItemView.findViewById<ImageView>(R.id.petImage)
-          GlideApp.with(viewCompanionFragment).load(petPhotos[position])
-            .fitCenter()
-            .into(imageView)
-          return carouselItemView
-        }
-      })
-      petCaroselView.pageCount = petPhotos.size
+    override fun onResume() {
+        populatePhotos()
+        super.onResume()
     }
-  }
 
-  private fun setupPhonNumberOnClick(){
-    fragmentViewCompanionBinding.telephone.setOnClickListener {
-      Dexter.withActivity(activity)
-        .withPermission(Manifest.permission.CALL_PHONE)
-        .withListener(
-          object : PermissionListener {
-            override fun onPermissionGranted(response: PermissionGrantedResponse) {/* ... */
-              val intent = Intent(Intent.ACTION_CALL, Uri.parse("tel:" + viewCompanionViewModel.telephone))
-              startActivity(intent)
-            }
-
-            override fun onPermissionDenied(response: PermissionDeniedResponse) {/* ... */
-            }
+    private fun populatePhotos() {
+        petPhotos = ArrayList()
+        animal.photos.forEach { photo ->
+            petPhotos.add(photo.full)
+        }
 
-            override fun onPermissionRationaleShouldBeShown(
-              permission: PermissionRequest,
-              token: PermissionToken
-            ) {/* ... */
-              token.continuePermissionRequest()
+        view?.let {
+            petCaroselView = it.findViewById(R.id.petCarouselView)
+            petCaroselView.setViewListener { position ->
+                val carouselItemView = layoutInflater.inflate(R.layout.companion_photo_layout, null)
+                val imageView = carouselItemView.findViewById<ImageView>(R.id.petImage)
+                GlideApp.with(viewCompanionFragment).load(petPhotos[position])
+                    .fitCenter()
+                    .into(imageView)
+                carouselItemView
             }
+            petCaroselView.pageCount = petPhotos.size
+        }
+    }
 
-          })
-        .onSameThread()
-        .check()
-
+    private fun setupPhonNumberOnClick(){
+        fragmentViewCompanionBinding.telephone.setOnClickListener {
+            // 1
+            Dexter.withActivity(activity)
+                .withPermission(Manifest.permission.CALL_PHONE)
+                .withListener(
+                    object : PermissionListener {
+                        // 3
+                        override fun onPermissionGranted(
+                            response: PermissionGrantedResponse
+                        ) {/* ... */
+                            val intent = Intent(Intent.ACTION_CALL, Uri.parse(
+                                "tel:" + viewCompanionViewModel.telephone))
+                            startActivity(intent)
+                        }
+
+                        override fun onPermissionDenied(
+                            response: PermissionDeniedResponse
+                        ) {/* ... */}
+
+                        // 2
+                        override fun onPermissionRationaleShouldBeShown(
+                            permission: PermissionRequest,
+                            token: PermissionToken
+                        ) {/* ... */
+                            token.continuePermissionRequest()
+                        }
+
+                    }
+                )
+                .onSameThread()
+                .check()
+        }
     }
-  }
 }
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/ViewCompanionViewModel.kt b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/ViewCompanionViewModel.kt
index a13ebbd..66f535c 100644
--- a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/ViewCompanionViewModel.kt
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/java/com/raywenderlich/codingcompanionfinder/searchforcompanion/ViewCompanionViewModel.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/res/layout/activity_main.xml b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/res/layout/activity_main.xml
index a2f61af..b7bb84c 100644
--- a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/res/layout/activity_main.xml
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/res/layout/activity_main.xml
@@ -7,7 +7,7 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
-  <fragment
+  <androidx.fragment.app.FragmentContainerView
       android:id="@+id/mainPetfinderFragment"
       android:name="androidx.navigation.fragment.NavHostFragment"
       android:layout_width="match_parent"
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/res/layout/fragment_random_companion.xml b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/res/layout/fragment_random_companion.xml
index 5cd433e..74c6631 100644
--- a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/res/layout/fragment_random_companion.xml
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/res/layout/fragment_random_companion.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2019 Razeware LLC
+  ~ Copyright (c) 2021 Razeware LLC
   ~
   ~ Permission is hereby granted, free of charge, to any person obtaining a copy
   ~ of this software and associated documentation files (the "Software"), to deal
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/res/layout/fragment_search_for_companion.xml b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/res/layout/fragment_search_for_companion.xml
index eed81e2..db49816 100644
--- a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/res/layout/fragment_search_for_companion.xml
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/res/layout/fragment_search_for_companion.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2019 Razeware LLC
+  ~ Copyright (c) 2021 Razeware LLC
   ~
   ~ Permission is hereby granted, free of charge, to any person obtaining a copy
   ~ of this software and associated documentation files (the "Software"), to deal
@@ -27,7 +27,9 @@
   ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   ~ THE SOFTWARE.
   -->
-<layout>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
   <data>
 
@@ -36,10 +38,8 @@
       type="com.raywenderlich.codingcompanionfinder.searchforcompanion.SearchForCompanionViewModel" />
   </data>
 
-  <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
+  <androidx.constraintlayout.widget.ConstraintLayout
+      android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".searchforcompanion.SearchForCompanionFragment">
 
@@ -72,14 +72,15 @@
       </com.google.android.material.textfield.TextInputLayout>
 
       <com.google.android.material.button.MaterialButton
-        android:id="@+id/searchButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Find"
-        app:layout_constraintBottom_toBottomOf="@+id/searchField"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/searchField"
-        app:layout_constraintTop_toTopOf="@id/searchField" />
+          android:id="@+id/searchButton"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:text="Find"
+          app:layout_constraintBottom_toBottomOf="@+id/searchField"
+          app:layout_constraintEnd_toEndOf="parent"
+          app:layout_constraintStart_toEndOf="@id/searchField"
+          app:layout_constraintTop_toTopOf="@id/searchField"
+          app:layout_constraintVertical_bias="0.0" />
 
       <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/petRecyclerView"
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/res/layout/fragment_view_companion.xml b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/res/layout/fragment_view_companion.xml
index 39895a8..9ac6326 100644
--- a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/res/layout/fragment_view_companion.xml
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/res/layout/fragment_view_companion.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2019 Razeware LLC
+  ~ Copyright (c) 2021 Razeware LLC
   ~
   ~ Permission is hereby granted, free of charge, to any person obtaining a copy
   ~ of this software and associated documentation files (the "Software"), to deal
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/res/menu/bottom_navigation_menu.xml b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/res/menu/bottom_navigation_menu.xml
index b2ca6a3..11f139a 100644
--- a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/res/menu/bottom_navigation_menu.xml
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/res/menu/bottom_navigation_menu.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2019 Razeware LLC
+  ~ Copyright (c) 2021 Razeware LLC
   ~
   ~ Permission is hereby granted, free of charge, to any person obtaining a copy
   ~ of this software and associated documentation files (the "Software"), to deal
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/res/navigation/nav_graph.xml b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/res/navigation/nav_graph.xml
index 39a9a5b..b26ac8d 100644
--- a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/res/navigation/nav_graph.xml
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/main/res/navigation/nav_graph.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2019 Razeware LLC
+  ~ Copyright (c) 2021 Razeware LLC
   ~
   ~ Permission is hereby granted, free of charge, to any person obtaining a copy
   ~ of this software and associated documentation files (the "Software"), to deal
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/androidTest/assets/search_30318.json b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/sharedTest/assets/search_30318.json
similarity index 100%
rename from 18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/androidTest/assets/search_30318.json
rename to 18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/sharedTest/assets/search_30318.json
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/androidTest/java/com/raywenderlich/codingcompanionfinder/CommonTestDataUtil.kt b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/sharedTest/java/com/raywenderlich/codingcompanionfinder/CommonTestDataUtil.kt
similarity index 67%
rename from 18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/androidTest/java/com/raywenderlich/codingcompanionfinder/CommonTestDataUtil.kt
rename to 18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/sharedTest/java/com/raywenderlich/codingcompanionfinder/CommonTestDataUtil.kt
index 7a8a6af..38463d5 100644
--- a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/androidTest/java/com/raywenderlich/codingcompanionfinder/CommonTestDataUtil.kt
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/sharedTest/java/com/raywenderlich/codingcompanionfinder/CommonTestDataUtil.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -38,14 +38,51 @@ import java.io.InputStreamReader
 object CommonTestDataUtil {
 
   fun dispatch(request: RecordedRequest): MockResponse? {
+    val headers = request.headers
+    // 1
+    if(request.method.equals("POST")){
+      if(request.path.equals("/oauth2/token")){
+        return MockResponse().setResponseCode(200).setBody(
+          "{\"access_token\":\"valid_token\"}")
+      }
+    }
+    // 2
+    val authorization = headers.values("Authorization")
+    if (!authorization.isEmpty() &&
+      authorization.get(0).equals("Bearer valid_token")) {
+      return when (request.path) {
+        "/animals?limit=20&location=30318" -> {
+          MockResponse().setResponseCode(200).setBody(
+            CommonTestDataUtil.readFile("search_30318.json")
+          )
+        }
+        "/animals?limit=20&location=90210" -> {
+          MockResponse().setResponseCode(200)
+            .setBody("{\"animals\": []}")
+        }
+        else -> {
+          MockResponse().setResponseCode(404).setBody("{}")
+        }
+      }
+    } else {
+      // 3
+      return MockResponse().setResponseCode(401).setBody("{}")
+    }
+  }
+
+  fun nonInterceptedDispatch(
+    request: RecordedRequest
+  ): MockResponse? {
+    val headers = request.headers
     return when (request.path) {
       "/animals?limit=20&location=30318" -> {
         MockResponse().setResponseCode(200).setBody(
-            readFile("search_30318.json")
+          readFile("search_30318.json")
         )
       }
       "/animals?limit=20&location=90210" -> {
-        MockResponse().setResponseCode(200).setBody("{\"animals\": []}")
+        MockResponse().setResponseCode(200)
+          .setBody("{\"animals\": []}")
       }
       else -> {
         MockResponse().setResponseCode(404).setBody("{}")
@@ -54,8 +91,11 @@ object CommonTestDataUtil {
   }
 
   @Throws(IOException::class)
-  private fun readFile(jsonFileName: String): String {
-    val inputStream = this::class.java.getResourceAsStream("/assets/$jsonFileName")
+  fun readFile(jsonFileName: String): String {
+    val inputStream = this::class.java
+      .getResourceAsStream("/assets/$jsonFileName") ?:
+    this::class.java
+      .getResourceAsStream("/$jsonFileName")
         ?: throw NullPointerException(
             "Have you added the local resource correctly?, "
                 + "Hint: name it as: " + jsonFileName
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/androidTest/java/com/raywenderlich/codingcompanionfinder/FindCompanionInstrumentedTest.kt b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/sharedTest/java/com/raywenderlich/codingcompanionfinder/FindCompanionInstrumentedTest.kt
similarity index 91%
rename from 18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/androidTest/java/com/raywenderlich/codingcompanionfinder/FindCompanionInstrumentedTest.kt
rename to 18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/sharedTest/java/com/raywenderlich/codingcompanionfinder/FindCompanionInstrumentedTest.kt
index a1d1f7a..4caebb8 100644
--- a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/androidTest/java/com/raywenderlich/codingcompanionfinder/FindCompanionInstrumentedTest.kt
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/sharedTest/java/com/raywenderlich/codingcompanionfinder/FindCompanionInstrumentedTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Razeware LLC
+ * Copyright (c) 2021 Razeware LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -50,14 +50,19 @@ import org.greenrobot.eventbus.Subscribe
 import org.junit.After
 
 import org.junit.Test
+import org.junit.Rule
 import org.junit.runner.RunWith
 
 import org.junit.Before
 import org.junit.BeforeClass
-import org.koin.dsl.module.module
-import org.koin.standalone.StandAloneContext.loadKoinModules
-import org.koin.standalone.StandAloneContext.stopKoin
+import org.koin.core.context.loadKoinModules
+import org.koin.core.context.startKoin
+import org.koin.core.context.stopKoin
+import org.koin.core.qualifier.named
+import org.koin.dsl.module
+import org.koin.test.AutoCloseKoinTest
 import org.koin.test.KoinTest
+import org.robolectric.annotation.LooperMode
 
 /**
  * Instrumented test, which will execute on an Android device.
@@ -65,16 +70,15 @@ import org.koin.test.KoinTest
  * See [testing documentation](http://d.android.com/tools/testing).
  */
 @RunWith(AndroidJUnit4::class)
-class FindCompanionInstrumentedTest: KoinTest {
+@LooperMode(LooperMode.Mode.PAUSED)
+class FindCompanionInstrumentedTest: AutoCloseKoinTest() {
 
   lateinit var testScenario: ActivityScenario<MainActivity>
 
   private val idlingResource = SimpleIdlingResource()
 
   companion object {
-    // 1
     val server = MockWebServer()
-    // 2
     val dispatcher: Dispatcher = object : Dispatcher() {
       @Throws(InterruptedException::class)
       override fun dispatch(request: RecordedRequest): MockResponse {
@@ -89,20 +93,17 @@ class FindCompanionInstrumentedTest: KoinTest {
     @BeforeClass
     @JvmStatic
     fun setup() {
-// 3
       server.setDispatcher(dispatcher)
       server.start()
-// 3
-      startIntent = Intent(ApplicationProvider.getApplicationContext(), MainActivity::class.java)
-      startIntent.putExtra(MainActivity.PETFINDER_URI,
-          server.url("").toString())
     }
   }
 
   private fun loadKoinTestModules() {
-    loadKoinModules(module(override = true) {
-      single<String>(name = PETFINDER_URL){server.url("").toString()}
-    }, appModule)
+    stopKoin()
+    startKoin {  }
+    loadKoinModules(listOf(module(override = true) {
+      single(named(PETFINDER_URL)){server.url("").toString()}
+    }, appModule))
   }
 
   @Subscribe
@@ -112,9 +113,9 @@ class FindCompanionInstrumentedTest: KoinTest {
 
   @Before
   fun beforeTestsRun() {
-    testScenario = ActivityScenario.launch(startIntent)
-    stopKoin()
     loadKoinTestModules()
+    testScenario = ActivityScenario.launch(MainActivity::class.java)
+
     EventBus.getDefault().register(this)
     IdlingRegistry.getInstance().register(idlingResource)
   }
@@ -124,7 +125,6 @@ class FindCompanionInstrumentedTest: KoinTest {
     // eventbus and idling resources unregister.
     IdlingRegistry.getInstance().unregister(idlingResource)
     EventBus.getDefault().unregister(this)
-    stopKoin()
     testScenario.close()
   }
 
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/sharedTest/java/com/raywenderlich/codingcompanionfinder/SearchForCompanionTest.kt b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/sharedTest/java/com/raywenderlich/codingcompanionfinder/SearchForCompanionTest.kt
new file mode 100644
index 0000000..71feb33
--- /dev/null
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/sharedTest/java/com/raywenderlich/codingcompanionfinder/SearchForCompanionTest.kt
@@ -0,0 +1,191 @@
+/*
+ * Copyright (c) 2021 Razeware LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * Notwithstanding the foregoing, you may not use, copy, modify, merge, publish,
+ * distribute, sublicense, create a derivative work, and/or sell copies of the
+ * Software in any work that is designed, intended, or marketed for pedagogical or
+ * instructional purposes related to programming, coding, application development,
+ * or information technology.  Permission for such use, copying, modification,
+ * merger, publication, distribution, sublicensing, creation of derivative works,
+ * or sale is expressly withheld.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package com.raywenderlich.codingcompanionfinder
+
+import androidx.fragment.app.FragmentFactory
+import androidx.fragment.app.testing.launchFragmentInContainer
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.robolectric.annotation.LooperMode
+import org.junit.runner.RunWith
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.IdlingRegistry
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.typeText
+import androidx.test.espresso.assertion.ViewAssertions
+import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import com.raywenderlich.codingcompanionfinder.searchforcompanion.SearchForCompanionFragment
+import com.raywenderlich.codingcompanionfinder.testhooks.IdlingEntity
+import okhttp3.mockwebserver.Dispatcher
+import okhttp3.mockwebserver.MockResponse
+import okhttp3.mockwebserver.MockWebServer
+import okhttp3.mockwebserver.RecordedRequest
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
+import org.junit.BeforeClass
+import org.koin.core.context.loadKoinModules
+import org.koin.core.qualifier.named
+import org.koin.dsl.module
+import org.junit.Before
+import org.junit.After
+import org.junit.Test
+import org.koin.core.context.startKoin
+import org.koin.core.context.stopKoin
+import org.koin.core.error.KoinAppAlreadyStartedException
+import org.koin.test.AutoCloseKoinTest
+import java.lang.IllegalStateException
+
+@RunWith(AndroidJUnit4::class)
+@LooperMode(LooperMode.Mode.PAUSED)
+class SearchForCompanionTest : AutoCloseKoinTest() {
+
+  private val idlingResource = SimpleIdlingResource()
+
+  companion object {
+    val server = MockWebServer()
+    val dispatcher: Dispatcher = object : Dispatcher() {
+      @Throws(InterruptedException::class)
+      override fun dispatch(
+        request: RecordedRequest
+      ): MockResponse {
+        return CommonTestDataUtil.dispatch(request) ?: MockResponse().setResponseCode(404)
+      }
+    }
+
+    @BeforeClass
+    @JvmStatic
+    fun setup() {
+      server.setDispatcher(dispatcher)
+      server.start()
+    }
+  }
+
+  private fun loadKoinTestModules(serverUrl: String){
+    loadKoinModules(listOf(module(override = true) {
+      single(named(PETFINDER_URL)) { serverUrl }
+    }))
+  }
+
+  private fun loadKoinTestModulesTryCatch(serverUrl: String) {
+    try {
+      loadKoinTestModules(serverUrl)
+    } catch (koinAlreadyStartedException: KoinAppAlreadyStartedException) {
+      stopKoin()
+      loadKoinTestModules(serverUrl)
+      loadKoinModules(listOf(module(override = true) {
+        single(named(PETFINDER_URL)) { serverUrl }
+      }))
+    } catch (illegalStateException: IllegalStateException){
+      startKoin {
+        modules(listOf(appModule))
+      }
+      loadKoinTestModules(serverUrl)
+    }
+  }
+
+  @Subscribe
+  fun onEvent(idlingEntity: IdlingEntity) {
+    idlingResource.incrementBy(idlingEntity.incrementValue)
+  }
+
+  @Before
+  fun beforeTestsRun() {
+    val serverUrl = server.url("").toString()
+    loadKoinTestModulesTryCatch(serverUrl)
+    launchFragmentInContainer<SearchForCompanionFragment>(
+      themeResId = R.style.AppTheme,
+      factory = FragmentFactory()
+    )
+    EventBus.getDefault().register(this)
+    IdlingRegistry.getInstance().register(idlingResource)
+  }
+
+  @Test
+  fun pressing_the_find_bottom_menu_item_takes_the_user_to_the_find_page() {
+    onView(withId(R.id.searchButton))
+      .check(matches(isDisplayed()))
+    onView(withId(R.id.searchFieldText))
+      .check(matches(isDisplayed()))
+    onView(withId(R.id.searchFieldText))
+      .perform(typeText("30318"))
+    onView(withId(R.id.searchButton)).perform(click())
+  }
+
+  @Test
+  fun searching_for_a_companion_in_90210_returns_no_results() {
+    onView(withId(R.id.searchFieldText))
+      .perform(typeText("90210"))
+    onView(withId(R.id.searchButton)).perform(click())
+    onView(withId(R.id.searchButton))
+      .check(matches(isDisplayed()))
+    onView(withId(R.id.noResults)).check(
+      matches(
+        withEffectiveVisibility(
+          Visibility.VISIBLE
+        )
+      )
+    )
+  }
+
+  @Test
+  fun searching_for_a_companion_in_a_call_returns_an_error_displays_no_results() {
+    onView(withId(R.id.searchFieldText)).perform(typeText("dddd"))
+    onView(withId(R.id.searchButton)).perform(click())
+    onView(withId(R.id.searchButton))
+      .check(ViewAssertions.matches(isDisplayed()))
+    onView(withId(R.id.noResults))
+      .check(ViewAssertions.matches(
+        withEffectiveVisibility(Visibility.VISIBLE)))
+  }
+
+  @Test
+  fun searching_for_a_companion_in_30318_returns_two_results() {
+    onView(withId(R.id.searchFieldText))
+      .perform(typeText("30318"))
+    onView(withId(R.id.searchButton)).perform(click())
+    onView(withId(R.id.searchButton))
+      .check(matches(isDisplayed()))
+    onView(withText("Joy")).check(matches(isDisplayed()))
+    onView(withText("Male")).check(matches(isDisplayed()))
+    onView(withText("Shih Tzu")).check(matches(isDisplayed()))
+    onView(withText("KEVIN")).check(matches(isDisplayed()))
+    onView(withText("Female")).check(matches(isDisplayed()))
+    onView(withText("Domestic Short Hair"))
+      .check(matches(isDisplayed()))
+  }
+
+  @After
+  fun afterTestsRun() {
+    // eventbus and idling resources unregister.
+    IdlingRegistry.getInstance().unregister(idlingResource)
+    EventBus.getDefault().unregister(this)
+    stopKoin()
+  }
+}
\ No newline at end of file
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/androidTest/java/com/raywenderlich/codingcompanionfinder/SimpleIdlingResource.kt b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/sharedTest/java/com/raywenderlich/codingcompanionfinder/SimpleIdlingResource.kt
similarity index 96%
rename from 18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/androidTest/java/com/raywenderlich/codingcompanionfinder/SimpleIdlingResource.kt
rename to 18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/sharedTest/java/com/raywenderlich/codingcompanionfinder/SimpleIdlingResource.kt
index 0f8d377..b063631 100644
--- a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/androidTest/java/com/raywenderlich/codingcompanionfinder/SimpleIdlingResource.kt
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/sharedTest/java/com/raywenderlich/codingcompanionfinder/SimpleIdlingResource.kt
@@ -6,12 +6,10 @@ import java.util.concurrent.atomic.AtomicInteger
 
 class SimpleIdlingResource : IdlingResource {
 
-  // 1
   @Nullable
   @Volatile
   private var callback: IdlingResource.ResourceCallback? = null
 
-  // 2
   // Idleness is controlled with this boolean.
   var activeResources = AtomicInteger(0)
 
@@ -19,7 +17,6 @@ class SimpleIdlingResource : IdlingResource {
     return this.javaClass.name
   }
 
-  // 3
   override fun isIdleNow(): Boolean {
     return activeResources.toInt() < 1
   }
@@ -28,7 +25,6 @@ class SimpleIdlingResource : IdlingResource {
     this.callback = callback
   }
 
-  // 4
   fun incrementBy(incrementValue: Int) {
     if (activeResources.addAndGet(incrementValue) < 1 && callback != null) {
       callback!!.onTransitionToIdle()
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/sharedTest/java/com/raywenderlich/codingcompanionfinder/ViewCompanionTest.kt b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/sharedTest/java/com/raywenderlich/codingcompanionfinder/ViewCompanionTest.kt
new file mode 100644
index 0000000..ced32a9
--- /dev/null
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/sharedTest/java/com/raywenderlich/codingcompanionfinder/ViewCompanionTest.kt
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2021 Razeware LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * Notwithstanding the foregoing, you may not use, copy, modify, merge, publish,
+ * distribute, sublicense, create a derivative work, and/or sell copies of the
+ * Software in any work that is designed, intended, or marketed for pedagogical or
+ * instructional purposes related to programming, coding, application development,
+ * or information technology.  Permission for such use, copying, modification,
+ * merger, publication, distribution, sublicensing, creation of derivative works,
+ * or sale is expressly withheld.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package com.raywenderlich.codingcompanionfinder
+
+import androidx.fragment.app.testing.launchFragmentInContainer
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.raywenderlich.codingcompanionfinder.models.Address
+import com.raywenderlich.codingcompanionfinder.models.Animal
+import com.raywenderlich.codingcompanionfinder.models.Breeds
+import com.raywenderlich.codingcompanionfinder.models.Contact
+import com.raywenderlich.codingcompanionfinder.searchforcompanion.ViewCompanionFragment
+import com.raywenderlich.codingcompanionfinder.searchforcompanion.ViewCompanionFragmentArgs
+import org.robolectric.annotation.LooperMode
+import org.junit.runner.RunWith
+import org.junit.Before
+import org.junit.Test
+
+import org.junit.BeforeClass
+import java.util.regex.Pattern.matches
+
+@RunWith(AndroidJUnit4::class)
+@LooperMode(LooperMode.Mode.PAUSED)
+class ViewCompanionTest {
+
+  @Before
+  fun beforeTestsRun() {
+// 1
+    val animal = Animal(
+      22,
+      Contact(
+        phone = "404-867-5309",
+        email = "coding.companion@razware.com",
+        address = Address(
+          "",
+          "",
+          "Atlanta",
+          "GA",
+          "30303",
+          "USA"
+        )
+      ),
+      "5",
+      "small",
+      arrayListOf(),
+      Breeds("shih tzu", "", false, false),
+      "Spike",
+      "male",
+      "A sweet little guy with spikey teeth!"
+    )
+    val bundle = ViewCompanionFragmentArgs(animal).toBundle()
+    launchFragmentInContainer<ViewCompanionFragment>(bundle,
+      R.style.AppTheme)
+  }
+
+  @Test
+  fun check_that_all_values_display_correctly() {
+    onView(withText("Spike")).check(matches(isDisplayed()))
+    onView(withText("Atlanta, GA")).check(matches(isDisplayed()))
+    onView(withText("shih tzu")).check(matches(isDisplayed()))
+    onView(withText("5")).check(matches(isDisplayed()))
+    onView(withText("male")).check(matches(isDisplayed()))
+    onView(withText("small")).check(matches(isDisplayed()))
+    onView(withText("A sweet little guy with spikey teeth!"))
+      .check(matches(isDisplayed()))
+    onView(withText("404-867-5309")).check(matches(isDisplayed()))
+    onView(withText("coding.companion@razware.com"))
+      .check(matches(isDisplayed()))
+  }
+}
\ No newline at end of file
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/sharedTest/java/com/raywenderlich/codingcompanionfinder/data/AnimalData.kt b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/sharedTest/java/com/raywenderlich/codingcompanionfinder/data/AnimalData.kt
new file mode 100644
index 0000000..149a5f0
--- /dev/null
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/sharedTest/java/com/raywenderlich/codingcompanionfinder/data/AnimalData.kt
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2021 Razeware LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * Notwithstanding the foregoing, you may not use, copy, modify, merge, publish,
+ * distribute, sublicense, create a derivative work, and/or sell copies of the
+ * Software in any work that is designed, intended, or marketed for pedagogical or
+ * instructional purposes related to programming, coding, application development,
+ * or information technology.  Permission for such use, copying, modification,
+ * merger, publication, distribution, sublicensing, creation of derivative works,
+ * or sale is expressly withheld.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package com.raywenderlich.codingcompanionfinder.data
+
+import com.github.javafaker.Faker
+import com.raywenderlich.codingcompanionfinder.data.AddressData.atlantaAddress
+import com.raywenderlich.codingcompanionfinder.data.BreedsData.shihTzu
+import com.raywenderlich.codingcompanionfinder.data.ContactsData.atlantaCodingShelter
+import com.raywenderlich.codingcompanionfinder.models.Address
+import com.raywenderlich.codingcompanionfinder.models.Animal
+import com.raywenderlich.codingcompanionfinder.models.Breeds
+import com.raywenderlich.codingcompanionfinder.models.Contact
+
+val faker = Faker()
+
+val fakerAddress = Address(
+  faker.address().streetAddress(),
+  faker.address().secondaryAddress(),
+  faker.address().city(),
+  faker.address().state(),
+  faker.address().zipCode(),
+  faker.address().country()
+)
+
+val fakerBreed = Breeds(faker.cat().breed(),
+  faker.dog().breed(), faker.bool().bool(), faker.bool().bool())
+
+val fakerShelter = Contact(
+  faker.phoneNumber().cellPhone(),
+  faker.internet().emailAddress(),
+  fakerAddress
+)
+
+val fakerAnimal = Animal(
+  faker.number().digits(3).toInt(),
+  fakerShelter,
+  faker.number().digit(),
+  faker.commerce().productName(),
+  arrayListOf(),
+  fakerBreed,
+  faker.name().name(),
+  faker.dog().gender(),
+  faker.chuckNorris().fact()
+)
+
+object AnimalData {
+  val atlantaShihTzuNamedSpike = Animal(
+    22,
+    atlantaCodingShelter,
+    "5",
+    "small",
+    arrayListOf(),
+    shihTzu,
+    "Spike",
+    "male",
+    "A sweet little guy with spikey teeth!"
+  )
+}
+
+object AddressData {
+  val atlantaAddress = Address(
+    "",
+    "",
+    "Atlanta",
+    "GA",
+    "30303",
+    "USA"
+  )
+}
+
+object BreedsData {
+  val shihTzu = Breeds("shih tzu", "", false, false)
+}
+
+object ContactsData {
+  val atlantaCodingShelter = Contact(
+    phone = "404-867-5309",
+    email = "coding.companion@razware.com",
+    address = atlantaAddress
+  )
+}
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/test/java/com/raywenderlich/codingcompanionfinder/SearchForCompanionViewModelTest.kt b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/test/java/com/raywenderlich/codingcompanionfinder/SearchForCompanionViewModelTest.kt
new file mode 100644
index 0000000..7c617b2
--- /dev/null
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/test/java/com/raywenderlich/codingcompanionfinder/SearchForCompanionViewModelTest.kt
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2021 Razeware LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * Notwithstanding the foregoing, you may not use, copy, modify, merge, publish,
+ * distribute, sublicense, create a derivative work, and/or sell copies of the
+ * Software in any work that is designed, intended, or marketed for pedagogical or
+ * instructional purposes related to programming, coding, application development,
+ * or information technology.  Permission for such use, copying, modification,
+ * merger, publication, distribution, sublicensing, creation of derivative works,
+ * or sale is expressly withheld.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package com.raywenderlich.codingcompanionfinder
+
+import android.view.View.INVISIBLE
+import android.view.View.VISIBLE
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import com.raywenderlich.codingcompanionfinder.retrofit.AuthorizationInterceptor
+import com.raywenderlich.codingcompanionfinder.retrofit.PetFinderService
+import com.raywenderlich.codingcompanionfinder.searchforcompanion.SearchForCompanionViewModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.newSingleThreadContext
+import kotlinx.coroutines.test.setMain
+import okhttp3.OkHttpClient
+import okhttp3.logging.HttpLoggingInterceptor
+import okhttp3.mockwebserver.Dispatcher
+import okhttp3.mockwebserver.MockResponse
+import okhttp3.mockwebserver.MockWebServer
+import okhttp3.mockwebserver.RecordedRequest
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+
+class SearchForCompanionViewModelTest {
+
+  @get:Rule
+  val instantTaskExecutorRule = InstantTaskExecutorRule()
+
+  private val mainThreadSurrogate =
+    newSingleThreadContext("Mocked UI thread")
+
+  val server = MockWebServer()
+
+  lateinit var petFinderService: PetFinderService
+
+  val dispatcher: Dispatcher = object : Dispatcher() {
+    @Throws(InterruptedException::class)
+    override fun dispatch(
+      request: RecordedRequest
+    ): MockResponse {
+      return CommonTestDataUtil.nonInterceptedDispatch(request) ?:
+      MockResponse().setResponseCode(404)
+    }
+  }
+
+  @Before
+  fun setup() {
+    Dispatchers.setMain(mainThreadSurrogate)
+    server.setDispatcher(dispatcher)
+    server.start()
+    val logger = HttpLoggingInterceptor()
+    val client = OkHttpClient.Builder()
+      .addInterceptor(logger)
+      .connectTimeout(60L, TimeUnit.SECONDS)
+      .readTimeout(60L, TimeUnit.SECONDS)
+      .build()
+    petFinderService = Retrofit.Builder()
+      .baseUrl(server.url("").toString())
+      .addConverterFactory(GsonConverterFactory.create())
+      .client(client)
+      .build().create(PetFinderService::class.java)
+  }
+
+  // 4
+  @Test
+  fun call_to_searchForCompanions_gets_results() {
+    val searchForCompanionViewModel =
+      SearchForCompanionViewModel(petFinderService)
+    searchForCompanionViewModel.companionLocation.value = "30318"
+// 1
+    val countDownLatch = CountDownLatch(1)
+    searchForCompanionViewModel.searchForCompanions()
+// 2
+    searchForCompanionViewModel.animals.observeForever {
+      countDownLatch.countDown()
+    }
+// 3
+    countDownLatch.await(2, TimeUnit.SECONDS)
+    Assert.assertEquals(2,
+      searchForCompanionViewModel.animals.value!!.size)
+  }
+
+  fun callSearchForCompanionWithALocationAndWaitForVisibilityResult(location: String): SearchForCompanionViewModel{
+    val searchForCompanionViewModel =
+      SearchForCompanionViewModel(petFinderService)
+    searchForCompanionViewModel.companionLocation.value = location
+    val countDownLatch = CountDownLatch(1)
+    searchForCompanionViewModel.searchForCompanions()
+    searchForCompanionViewModel.noResultsViewVisiblity
+      .observeForever {
+        countDownLatch.countDown()
+      }
+
+    countDownLatch.await(2, TimeUnit.SECONDS)
+    return searchForCompanionViewModel
+  }
+
+  @Test
+  fun call_to_searchForCompanions_with_results_sets_the_visibility_of_no_results_to_INVISIBLE() {
+    val searchForCompanionViewModel = callSearchForCompanionWithALocationAndWaitForVisibilityResult("30318")
+    Assert.assertEquals(INVISIBLE,
+      searchForCompanionViewModel.noResultsViewVisiblity.value)
+  }
+
+  @Test
+  fun call_to_searchForCompanions_with_no_results_sets_the_visibility_of_no_results_to_VISIBLE() {
+    val searchForCompanionViewModel = callSearchForCompanionWithALocationAndWaitForVisibilityResult("90210")
+    Assert.assertEquals(VISIBLE,
+      searchForCompanionViewModel.noResultsViewVisiblity.value)
+  }
+}
\ No newline at end of file
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/test/java/com/raywenderlich/codingcompanionfinder/ViewCompanionViewModelTest.kt b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/test/java/com/raywenderlich/codingcompanionfinder/ViewCompanionViewModelTest.kt
new file mode 100644
index 0000000..33a9384
--- /dev/null
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/app/src/test/java/com/raywenderlich/codingcompanionfinder/ViewCompanionViewModelTest.kt
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2021 Razeware LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * Notwithstanding the foregoing, you may not use, copy, modify, merge, publish,
+ * distribute, sublicense, create a derivative work, and/or sell copies of the
+ * Software in any work that is designed, intended, or marketed for pedagogical or
+ * instructional purposes related to programming, coding, application development,
+ * or information technology.  Permission for such use, copying, modification,
+ * merger, publication, distribution, sublicensing, creation of derivative works,
+ * or sale is expressly withheld.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package com.raywenderlich.codingcompanionfinder
+
+import com.raywenderlich.codingcompanionfinder.data.AnimalData.atlantaShihTzuNamedSpike
+import com.raywenderlich.codingcompanionfinder.data.fakerAnimal
+import com.raywenderlich.codingcompanionfinder.models.Address
+import com.raywenderlich.codingcompanionfinder.models.Animal
+import com.raywenderlich.codingcompanionfinder.models.Breeds
+import com.raywenderlich.codingcompanionfinder.models.Contact
+import com.raywenderlich.codingcompanionfinder.searchforcompanion.ViewCompanionViewModel
+import org.junit.Test
+
+import org.junit.Assert.*
+
+class ViewCompanionViewModelTest {
+  val animal = Animal(
+    22,
+    Contact(
+      phone = "404-867-5309",
+      email = "coding.companion@razware.com",
+      address = Address(
+        "",
+        "",
+        "Atlanta",
+        "GA",
+        "30303",
+        "USA"
+      ) ),
+    "5",
+    "small",
+    arrayListOf(),
+    Breeds("shih tzu", "", false, false),
+    "Spike",
+    "male",
+    "A sweet little guy with spikey teeth!"
+  )
+  @Test
+  fun populateFromAnimal_sets_the_animals_name_to_the_view_model() {
+    val viewCompanionViewModel = ViewCompanionViewModel()
+    viewCompanionViewModel
+      .populateFromAnimal(atlantaShihTzuNamedSpike)
+    assert(viewCompanionViewModel.name
+      .equals(atlantaShihTzuNamedSpike.name))
+  }
+
+  @Test
+  fun populateFromAnimal_sets_the_animals_description_to_the_view_model(){
+    val viewCompanionViewModel = ViewCompanionViewModel()
+    System.out.println(fakerAnimal.toString())
+    viewCompanionViewModel.populateFromAnimal(fakerAnimal)
+    assertEquals(fakerAnimal.description, viewCompanionViewModel.description)
+  }
+}
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/build.gradle b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/build.gradle
index 972d15f..fbe1b82 100644
--- a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/build.gradle
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/build.gradle
@@ -1,15 +1,15 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.5.0'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:4.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.1.0-rc01"
+        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.3.5"
 
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/gradle/wrapper/gradle-wrapper.jar b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/gradle/wrapper/gradle-wrapper.jar
index 5c2d1cf..f6b961f 100644
Binary files a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/gradle/wrapper/gradle-wrapper.jar and b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/gradle/wrapper/gradle-wrapper.properties b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/gradle/wrapper/gradle-wrapper.properties
index e31774f..8ba38f1 100644
--- a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/gradle/wrapper/gradle-wrapper.properties
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Sep 03 20:02:03 CDT 2019
+#Wed Jun 16 22:40:20 EDT 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip
+zipStoreBase=GRADLE_USER_HOME
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/gradlew b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/gradlew
index 8e25e6c..cccdd3d 100755
--- a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/gradlew
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/gradlew
@@ -1,21 +1,5 @@
 #!/usr/bin/env sh
 
-#
-# Copyright 2015 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -44,7 +28,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+DEFAULT_JVM_OPTS=""
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
diff --git a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/gradlew.bat b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/gradlew.bat
index 24467a1..e95643d 100644
--- a/18-testing-around-other-components/projects/starter/CodingCompanionFinder/gradlew.bat
+++ b/18-testing-around-other-components/projects/starter/CodingCompanionFinder/gradlew.bat
@@ -1,19 +1,3 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -30,7 +14,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+set DEFAULT_JVM_OPTS=
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome