diff --git a/spring-data-mongodb/pom.xml b/spring-data-mongodb/pom.xml
index 85b13be49..0bb48d9f7 100644
--- a/spring-data-mongodb/pom.xml
+++ b/spring-data-mongodb/pom.xml
@@ -279,12 +279,12 @@
 			<version>${kotlin}</version>
 			<scope>test</scope>
 		</dependency>
+
 		<dependency>
 			<groupId>io.mockk</groupId>
 			<artifactId>mockk</artifactId>
-			<version>1.9.1</version>
+			<version>${mockk}</version>
 			<scope>test</scope>
-
 		</dependency>
 
 	</dependencies>
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableFindOperationExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableFindOperationExtensionsTests.kt
index 743b3ad9c..f2ae29aec 100644
--- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableFindOperationExtensionsTests.kt
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableFindOperationExtensionsTests.kt
@@ -26,51 +26,51 @@ import org.junit.Test
  */
 class ExecutableFindOperationExtensionsTests {
 
-    val operation = mockk<ExecutableFindOperation>(relaxed = true)
+	val operation = mockk<ExecutableFindOperation>(relaxed = true)
 
-    val operationWithProjection = mockk<ExecutableFindOperation.FindWithProjection<First>>(relaxed = true)
+	val operationWithProjection = mockk<ExecutableFindOperation.FindWithProjection<First>>(relaxed = true)
 
-    val distinctWithProjection = mockk<ExecutableFindOperation.DistinctWithProjection>(relaxed = true)
+	val distinctWithProjection = mockk<ExecutableFindOperation.DistinctWithProjection>(relaxed = true)
 
-    @Test // DATAMONGO-1689
-    fun `ExecutableFindOperation#query(KClass) extension should call its Java counterpart`() {
+	@Test // DATAMONGO-1689
+	fun `ExecutableFindOperation#query(KClass) extension should call its Java counterpart`() {
 
-        operation.query(First::class)
-        verify { operation.query(First::class.java) }
-    }
+		operation.query(First::class)
+		verify { operation.query(First::class.java) }
+	}
 
-    @Test // DATAMONGO-1689
-    fun `ExecutableFindOperation#query() with reified type parameter extension should call its Java counterpart`() {
+	@Test // DATAMONGO-1689
+	fun `ExecutableFindOperation#query() with reified type parameter extension should call its Java counterpart`() {
 
-        operation.query<First>()
-        verify { operation.query(First::class.java) }
-    }
+		operation.query<First>()
+		verify { operation.query(First::class.java) }
+	}
 
-    @Test // DATAMONGO-1689, DATAMONGO-2086
-    fun `ExecutableFindOperation#FindOperationWithProjection#asType(KClass) extension should call its Java counterpart`() {
+	@Test // DATAMONGO-1689, DATAMONGO-2086
+	fun `ExecutableFindOperation#FindOperationWithProjection#asType(KClass) extension should call its Java counterpart`() {
 
-        operationWithProjection.asType(User::class)
-        verify { operationWithProjection.`as`(User::class.java) }
-    }
+		operationWithProjection.asType(User::class)
+		verify { operationWithProjection.`as`(User::class.java) }
+	}
 
-    @Test // DATAMONGO-1689, DATAMONGO-2086
-    fun `ExecutableFindOperation#FindOperationWithProjection#asType() with reified type parameter extension should call its Java counterpart`() {
+	@Test // DATAMONGO-1689, DATAMONGO-2086
+	fun `ExecutableFindOperation#FindOperationWithProjection#asType() with reified type parameter extension should call its Java counterpart`() {
 
-        operationWithProjection.asType<User>()
-        verify { operationWithProjection.`as`(User::class.java) }
-    }
+		operationWithProjection.asType<User>()
+		verify { operationWithProjection.`as`(User::class.java) }
+	}
 
-    @Test // DATAMONGO-1761, DATAMONGO-2086
-    fun `ExecutableFindOperation#DistinctWithProjection#asType(KClass) extension should call its Java counterpart`() {
+	@Test // DATAMONGO-1761, DATAMONGO-2086
+	fun `ExecutableFindOperation#DistinctWithProjection#asType(KClass) extension should call its Java counterpart`() {
 
-        distinctWithProjection.asType(User::class)
-        verify { distinctWithProjection.`as`(User::class.java) }
-    }
+		distinctWithProjection.asType(User::class)
+		verify { distinctWithProjection.`as`(User::class.java) }
+	}
 
-    @Test // DATAMONGO-2086
-    fun `ExecutableFindOperation#DistinctWithProjection#asType() with reified type parameter extension should call its Java counterpart`() {
+	@Test // DATAMONGO-2086
+	fun `ExecutableFindOperation#DistinctWithProjection#asType() with reified type parameter extension should call its Java counterpart`() {
 
-        distinctWithProjection.asType<User>()
-        verify { distinctWithProjection.`as`(User::class.java) }
-    }
+		distinctWithProjection.asType<User>()
+		verify { distinctWithProjection.`as`(User::class.java) }
+	}
 }
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableInsertOperationExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableInsertOperationExtensionsTests.kt
index 92d27d4be..f4c0cc90e 100644
--- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableInsertOperationExtensionsTests.kt
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableInsertOperationExtensionsTests.kt
@@ -26,20 +26,20 @@ import org.junit.Test
  */
 class ExecutableInsertOperationExtensionsTests {
 
-    val operation = mockk<ExecutableInsertOperation>(relaxed = true)
+	val operation = mockk<ExecutableInsertOperation>(relaxed = true)
 
-    @Test // DATAMONGO-1689
-    fun `insert(KClass) extension should call its Java counterpart`() {
+	@Test // DATAMONGO-1689
+	fun `insert(KClass) extension should call its Java counterpart`() {
 
-        operation.insert(First::class)
-        verify { operation.insert(First::class.java) }
-    }
+		operation.insert(First::class)
+		verify { operation.insert(First::class.java) }
+	}
 
-    @Test // DATAMONGO-1689
-    fun `insert() with reified type parameter extension should call its Java counterpart`() {
+	@Test // DATAMONGO-1689
+	fun `insert() with reified type parameter extension should call its Java counterpart`() {
 
-        operation.insert<First>()
-        verify { operation.insert(First::class.java) }
-    }
+		operation.insert<First>()
+		verify { operation.insert(First::class.java) }
+	}
 
 }
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableMapReduceOperationExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableMapReduceOperationExtensionsTests.kt
index 9cae0e84c..3168765ba 100644
--- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableMapReduceOperationExtensionsTests.kt
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableMapReduceOperationExtensionsTests.kt
@@ -22,6 +22,7 @@ import org.junit.Test
 
 /**
  * @author Christoph Strobl
+ * @author Sebastien Deleuze
  */
 class ExecutableMapReduceOperationExtensionsTests {
 
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableRemoveOperationExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableRemoveOperationExtensionsTests.kt
index 5dca666dd..fbd2e350e 100644
--- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableRemoveOperationExtensionsTests.kt
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableRemoveOperationExtensionsTests.kt
@@ -26,20 +26,20 @@ import org.junit.Test
  */
 class ExecutableRemoveOperationExtensionsTests {
 
-    val operation = mockk<ExecutableRemoveOperation>(relaxed = true)
+	val operation = mockk<ExecutableRemoveOperation>(relaxed = true)
 
-    @Test // DATAMONGO-1689
-    fun `remove(KClass) extension should call its Java counterpart`() {
+	@Test // DATAMONGO-1689
+	fun `remove(KClass) extension should call its Java counterpart`() {
 
-        operation.remove(First::class)
-        verify { operation.remove(First::class.java) }
-    }
+		operation.remove(First::class)
+		verify { operation.remove(First::class.java) }
+	}
 
-    @Test // DATAMONGO-1689
-    fun `remove() with reified type parameter extension should call its Java counterpart`() {
+	@Test // DATAMONGO-1689
+	fun `remove() with reified type parameter extension should call its Java counterpart`() {
 
-        operation.remove<First>()
-        verify { operation.remove(First::class.java) }
-    }
+		operation.remove<First>()
+		verify { operation.remove(First::class.java) }
+	}
 
 }
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableUpdateOperationExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableUpdateOperationExtensionsTests.kt
index 2119d0998..26887589f 100644
--- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableUpdateOperationExtensionsTests.kt
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableUpdateOperationExtensionsTests.kt
@@ -24,6 +24,7 @@ import org.junit.Test
  * Unit tests for `ExecutableUpdateOperationExtensions.kt`.
  *
  * @author Christoph Strobl
+ * @author Sebastien Deleuze
  */
 class ExecutableUpdateOperationExtensionsTests {
 
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/MongoOperationsExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/MongoOperationsExtensionsTests.kt
index e85cdec29..a86145dd7 100644
--- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/MongoOperationsExtensionsTests.kt
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/MongoOperationsExtensionsTests.kt
@@ -147,7 +147,7 @@ class MongoOperationsExtensionsTests {
 	fun `indexOps() with reified type parameter extension should call its Java counterpart`() {
 
 		operations.indexOps<First>()
-		verify { operations .indexOps(First::class.java) }
+		verify { operations.indexOps(First::class.java) }
 	}
 
 	@Test // DATAMONGO-1689
@@ -716,7 +716,7 @@ class MongoOperationsExtensionsTests {
 		operations.findDistinct<String, First>(query, "field", "collection")
 		verify { operations.findDistinct(query, "field", "collection", First::class.java, String::class.java) }
 	}
-	
+
 	@Test // DATAMONGO-1761
 	fun `findDistinct(Query, String,  KClass) should call java counterpart`() {
 
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveAggregationOperationExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveAggregationOperationExtensionsTests.kt
index 36f983898..0d94e66fb 100644
--- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveAggregationOperationExtensionsTests.kt
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveAggregationOperationExtensionsTests.kt
@@ -22,23 +22,24 @@ import org.junit.Test
 
 /**
  * @author Mark Paluch
+ * @author Sebastien Deleuze
  */
 class ReactiveAggregationOperationExtensionsTests {
 
-    val operation = mockk<ReactiveAggregationOperation>(relaxed = true)
+	val operation = mockk<ReactiveAggregationOperation>(relaxed = true)
 
-    @Test // DATAMONGO-1719
-    fun `aggregateAndReturn(KClass) extension should call its Java counterpart`() {
+	@Test // DATAMONGO-1719
+	fun `aggregateAndReturn(KClass) extension should call its Java counterpart`() {
 
-        operation.aggregateAndReturn(First::class)
-        verify { operation.aggregateAndReturn(First::class.java) }
-    }
+		operation.aggregateAndReturn(First::class)
+		verify { operation.aggregateAndReturn(First::class.java) }
+	}
 
-    @Test // DATAMONGO-1719
-    fun `aggregateAndReturn() with reified type parameter extension should call its Java counterpart`() {
+	@Test // DATAMONGO-1719
+	fun `aggregateAndReturn() with reified type parameter extension should call its Java counterpart`() {
 
-        operation.aggregateAndReturn<First>()
-        verify { operation.aggregateAndReturn(First::class.java) }
-    }
+		operation.aggregateAndReturn<First>()
+		verify { operation.aggregateAndReturn(First::class.java) }
+	}
 
 }
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveFindOperationExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveFindOperationExtensionsTests.kt
index df608ee00..c13ea4f9a 100644
--- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveFindOperationExtensionsTests.kt
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveFindOperationExtensionsTests.kt
@@ -22,6 +22,7 @@ import org.junit.Test
 
 /**
  * @author Mark Paluch
+ * @author Sebastien Deleuze
  */
 class ReactiveFindOperationExtensionsTests {
 
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveInsertOperationExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveInsertOperationExtensionsTests.kt
index 1d2a1f0b5..ccfa52866 100644
--- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveInsertOperationExtensionsTests.kt
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveInsertOperationExtensionsTests.kt
@@ -22,6 +22,7 @@ import org.junit.Test
 
 /**
  * @author Mark Paluch
+ * @author Sebastien Deleuze
  */
 class ReactiveInsertOperationExtensionsTests {
 
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveMapReduceOperationExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveMapReduceOperationExtensionsTests.kt
index 334b26d95..bbc3a0adc 100644
--- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveMapReduceOperationExtensionsTests.kt
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveMapReduceOperationExtensionsTests.kt
@@ -22,6 +22,7 @@ import org.junit.Test
 
 /**
  * @author Christoph Strobl
+ * @author Sebastien Deleuze
  */
 class ReactiveMapReduceOperationExtensionsTests {
 
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveMongoOperationsExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveMongoOperationsExtensionsTests.kt
index d10c2a253..b3b7c15df 100644
--- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveMongoOperationsExtensionsTests.kt
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveMongoOperationsExtensionsTests.kt
@@ -566,7 +566,7 @@ class ReactiveMongoOperationsExtensionsTests {
 		verify { operations.findDistinct(query, "field", "collection", First::class.java, String::class.java) }
 	}
 
-	
+
 	@Test // DATAMONGO-1761
 	fun `findDistinct(Query, String,  KClass) should call java counterpart`() {
 
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveRemoveOperationExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveRemoveOperationExtensionsTests.kt
index a4653b10c..f6fb4f478 100644
--- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveRemoveOperationExtensionsTests.kt
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveRemoveOperationExtensionsTests.kt
@@ -22,6 +22,7 @@ import org.junit.Test
 
 /**
  * @author Mark Paluch
+ * @author Sebastien Deleuze
  */
 class ReactiveRemoveOperationExtensionsTests {
 
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveUpdateOperationExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveUpdateOperationExtensionsTests.kt
index cf27253b4..3e571bb84 100644
--- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveUpdateOperationExtensionsTests.kt
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveUpdateOperationExtensionsTests.kt
@@ -24,6 +24,7 @@ import org.junit.Test
  * Unit tests for `ReactiveExecutableUpdateOperationExtensions.kt`.
  *
  * @author Mark Paluch
+ * @author Sebastien Deleuze
  */
 class ReactiveUpdateOperationExtensionsTests {