diff --git a/build.gradle b/build.gradle
index d709464..732584a 100644
--- a/build.gradle
+++ b/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.3.60'
     ext.nav_version = '2.2.0-beta01'
 
     repositories {
         google()
         jcenter()
-
+        maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:4.0.0-alpha03'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:0.9.18"
         classpath "de.mannodermaus.gradle.plugins:android-junit5:1.5.1.0"
@@ -29,14 +29,10 @@ allprojects {
     repositories {
         google()
         jcenter()
-
+        maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
     }
 }
 
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
-
 task removeReports(type: Delete) {
     delete fileTree(rootProject.projectDir.path + "/reports") {
         include '**/*.*'
diff --git a/features/detail/src/test/java/com/melih/detail/DetailViewModelTest.kt b/features/detail/src/test/java/com/melih/detail/DetailViewModelTest.kt
index d4cc572..8d7fc96 100644
--- a/features/detail/src/test/java/com/melih/detail/DetailViewModelTest.kt
+++ b/features/detail/src/test/java/com/melih/detail/DetailViewModelTest.kt
@@ -1,13 +1,18 @@
 package com.melih.detail
 
+import androidx.lifecycle.viewModelScope
 import com.melih.detail.ui.DetailViewModel
 import com.melih.interactors.GetLaunchDetails
 import com.melih.launches.data.LaunchDetailItem
+import io.mockk.every
 import io.mockk.mockk
 import io.mockk.slot
 import io.mockk.spyk
 import io.mockk.verify
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.TestCoroutineScope
 import kotlinx.coroutines.test.runBlockingTest
 import org.amshove.kluent.shouldEqualTo
 import org.junit.jupiter.api.Test
@@ -34,7 +39,9 @@ class DetailViewModelTest : BaseTestWithMainThread() {
             viewModel.loadData()
 
             // init should have called it already due to creation above
-            verify(exactly = 1) { getLaunchDetails(capture(paramsSlot)) }
+            verify(exactly = 1, timeout = 5000) {
+                getLaunchDetails(capture(paramsSlot))
+            }
             paramsSlot.captured.id shouldEqualTo 1013
         }
     }
diff --git a/gradle.properties b/gradle.properties
index 70e38b1..da11d04 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -24,3 +24,5 @@ kotlin.incremental=true
 kapt.incremental.apt=true
 kapt.use.worker.api=true
 kapt.include.compile.classpath=false
+#For incremental databinding
+android.databinding.incremental=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 83937fc..697a89f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Sep 04 15:39:59 CEST 2019
+#Mon Nov 18 14:54:51 CET 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-all.zip