diff --git a/pom.xml b/pom.xml
index 0aa6dcd0..2f3b6ed4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,6 @@
 		<r2dbc-releasetrain.version>Arabba-M7</r2dbc-releasetrain.version>
 		<reactive-streams.version>1.0.1</reactive-streams.version>
 		<testcontainers.version>1.10.1</testcontainers.version>
-		<coroutines.version>1.1.1</coroutines.version>
 
 	</properties>
 
@@ -131,25 +130,26 @@
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
 			<artifactId>kotlin-stdlib</artifactId>
-			<version>${kotlin}</version>
 			<optional>true</optional>
 		</dependency>
+
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
 			<artifactId>kotlin-reflect</artifactId>
-			<version>${kotlin}</version>
 			<optional>true</optional>
 		</dependency>
+
 		<dependency>
 			<groupId>org.jetbrains.kotlinx</groupId>
 			<artifactId>kotlinx-coroutines-core</artifactId>
-			<version>${coroutines.version}</version>
+			<version>${kotlin-coroutines}</version>
 			<optional>true</optional>
 		</dependency>
+
 		<dependency>
 			<groupId>org.jetbrains.kotlinx</groupId>
 			<artifactId>kotlinx-coroutines-reactor</artifactId>
-			<version>${coroutines.version}</version>
+			<version>${kotlin-coroutines}</version>
 			<optional>true</optional>
 		</dependency>
 
@@ -228,7 +228,7 @@
 		<dependency>
 			<groupId>io.mockk</groupId>
 			<artifactId>mockk</artifactId>
-			<version>1.9.1</version>
+			<version>${mockk}</version>
 			<scope>test</scope>
 		</dependency>
 
diff --git a/src/test/kotlin/org/springframework/data/r2dbc/function/DatabaseClientExtensionsTests.kt b/src/test/kotlin/org/springframework/data/r2dbc/function/DatabaseClientExtensionsTests.kt
index 62dc461d..3ace37d4 100644
--- a/src/test/kotlin/org/springframework/data/r2dbc/function/DatabaseClientExtensionsTests.kt
+++ b/src/test/kotlin/org/springframework/data/r2dbc/function/DatabaseClientExtensionsTests.kt
@@ -19,96 +19,122 @@ import io.mockk.every
 import io.mockk.mockk
 import io.mockk.verify
 import kotlinx.coroutines.runBlocking
-import org.junit.Assert.assertEquals
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 import reactor.core.publisher.Mono
 
+/**
+ * Unit tests for [DatabaseClient] extensions.
+ *
+ * @author Sebastien Deleuze
+ */
 class DatabaseClientExtensionsTests {
 
-    @Test
-    fun genericExecuteSpecAwait() {
-        val spec = mockk<DatabaseClient.GenericExecuteSpec>()
-        every { spec.then() } returns Mono.empty()
-        runBlocking {
-            spec.await()
-        }
-        verify {
-            spec.then()
-        }
-    }
+	@Test // gh-63
+	fun genericExecuteSpecAwait() {
 
-    @Test
-    fun genericExecuteSpecAsType() {
-        val genericSpec = mockk<DatabaseClient.GenericExecuteSpec>()
-        val typedSpec: DatabaseClient.TypedExecuteSpec<String> = mockk()
-        every { genericSpec.`as`(String::class.java) } returns typedSpec
-        runBlocking {
-            assertEquals(typedSpec, genericSpec.asType<String>())
-        }
-        verify {
-            genericSpec.`as`(String::class.java)
-        }
-    }
+		val spec = mockk<DatabaseClient.GenericExecuteSpec>()
+		every { spec.then() } returns Mono.empty()
 
-    @Test
-    fun genericSelectSpecAsType() {
-        val genericSpec = mockk<DatabaseClient.GenericSelectSpec>()
-        val typedSpec: DatabaseClient.TypedSelectSpec<String> = mockk()
-        every { genericSpec.`as`(String::class.java) } returns typedSpec
-        runBlocking {
-            assertEquals(typedSpec, genericSpec.asType<String>())
-        }
-        verify {
-            genericSpec.`as`(String::class.java)
-        }
-    }
+		runBlocking {
+			spec.await()
+		}
 
-    @Test
-    fun typedExecuteSpecAwait() {
-        val spec = mockk<DatabaseClient.TypedExecuteSpec<String>>()
-        every { spec.then() } returns Mono.empty()
-        runBlocking {
-            spec.await()
-        }
-        verify {
-            spec.then()
-        }
-    }
+		verify {
+			spec.then()
+		}
+	}
 
-    @Test
-    fun typedExecuteSpecAsType() {
-        val spec: DatabaseClient.TypedExecuteSpec<String> = mockk()
-        every { spec.`as`(String::class.java) } returns spec
-        runBlocking {
-            assertEquals(spec, spec.asType())
-        }
-        verify {
-            spec.`as`(String::class.java)
-        }
-    }
+	@Test // gh-63
+	fun genericExecuteSpecAsType() {
 
-    @Test
-    fun insertSpecAwait() {
-        val spec = mockk<DatabaseClient.InsertSpec<String>>()
-        every { spec.then() } returns Mono.empty()
-        runBlocking {
-            spec.await()
-        }
-        verify {
-            spec.then()
-        }
-    }
+		val genericSpec = mockk<DatabaseClient.GenericExecuteSpec>()
+		val typedSpec: DatabaseClient.TypedExecuteSpec<String> = mockk()
+		every { genericSpec.`as`(String::class.java) } returns typedSpec
 
-    @Test
-    fun insertIntoSpecInto() {
-        val spec = mockk<DatabaseClient.InsertIntoSpec>()
-        val typedSpec: DatabaseClient.TypedInsertSpec<String> = mockk()
-        every { spec.into(String::class.java) } returns typedSpec
-        runBlocking {
-            assertEquals(typedSpec, spec.into<String>())
-        }
-        verify {
-            spec.into(String::class.java)
-        }
-    }
+		runBlocking {
+			assertThat(genericSpec.asType<String>()).isEqualTo(typedSpec)
+		}
+
+		verify {
+			genericSpec.`as`(String::class.java)
+		}
+	}
+
+	@Test // gh-63
+	fun genericSelectSpecAsType() {
+
+		val genericSpec = mockk<DatabaseClient.GenericSelectSpec>()
+		val typedSpec: DatabaseClient.TypedSelectSpec<String> = mockk()
+		every { genericSpec.`as`(String::class.java) } returns typedSpec
+
+		runBlocking {
+			assertThat(genericSpec.asType<String>()).isEqualTo(typedSpec)
+		}
+
+		verify {
+			genericSpec.`as`(String::class.java)
+		}
+	}
+
+	@Test // gh-63
+	fun typedExecuteSpecAwait() {
+
+		val spec = mockk<DatabaseClient.TypedExecuteSpec<String>>()
+		every { spec.then() } returns Mono.empty()
+
+		runBlocking {
+			spec.await()
+		}
+
+		verify {
+			spec.then()
+		}
+	}
+
+	@Test // gh-63
+	fun typedExecuteSpecAsType() {
+
+		val spec: DatabaseClient.TypedExecuteSpec<String> = mockk()
+		every { spec.`as`(String::class.java) } returns spec
+
+		runBlocking {
+			assertThat(spec.asType()).isEqualTo(spec)
+		}
+
+		verify {
+			spec.`as`(String::class.java)
+		}
+	}
+
+	@Test // gh-63
+	fun insertSpecAwait() {
+
+		val spec = mockk<DatabaseClient.InsertSpec<String>>()
+		every { spec.then() } returns Mono.empty()
+
+		runBlocking {
+			spec.await()
+		}
+
+		verify {
+			spec.then()
+		}
+	}
+
+	@Test // gh-63
+	fun insertIntoSpecInto() {
+
+		val spec = mockk<DatabaseClient.InsertIntoSpec>()
+		val typedSpec: DatabaseClient.TypedInsertSpec<String> = mockk()
+		every { spec.into(String::class.java) } returns typedSpec
+
+		runBlocking {
+			assertThat(spec.into<String>()).isEqualTo(typedSpec)
+		}
+
+		verify {
+			spec.into(String::class.java)
+		}
+	}
 }
diff --git a/src/test/kotlin/org/springframework/data/r2dbc/function/RowsFetchSpecExtensionsTests.kt b/src/test/kotlin/org/springframework/data/r2dbc/function/RowsFetchSpecExtensionsTests.kt
index 760e9ef3..5f1d92e0 100644
--- a/src/test/kotlin/org/springframework/data/r2dbc/function/RowsFetchSpecExtensionsTests.kt
+++ b/src/test/kotlin/org/springframework/data/r2dbc/function/RowsFetchSpecExtensionsTests.kt
@@ -19,33 +19,44 @@ import io.mockk.every
 import io.mockk.mockk
 import io.mockk.verify
 import kotlinx.coroutines.runBlocking
-import org.junit.Assert.assertEquals
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 import reactor.core.publisher.Mono
 
+/**
+ * Unit tests for [RowsFetchSpec] extensions.
+ *
+ * @author Sebastien Deleuze
+ */
 class RowsFetchSpecExtensionsTests {
 
-    @Test
-    fun awaitOne() {
-        val spec = mockk<RowsFetchSpec<String>>()
-        every { spec.one() } returns Mono.just("foo")
-        runBlocking {
-            assertEquals("foo", spec.awaitOne())
-        }
-        verify {
-            spec.one()
-        }
-    }
+	@Test // gh-63
+	fun awaitOne() {
 
-    @Test
-    fun awaitFirst() {
-        val spec = mockk<RowsFetchSpec<String>>()
-        every { spec.first() } returns Mono.just("foo")
-        runBlocking {
-            assertEquals("foo", spec.awaitFirst())
-        }
-        verify {
-            spec.first()
-        }
-    }
+		val spec = mockk<RowsFetchSpec<String>>()
+		every { spec.one() } returns Mono.just("foo")
+
+		runBlocking {
+			assertThat(spec.awaitOne()).isEqualTo("foo")
+		}
+
+		verify {
+			spec.one()
+		}
+	}
+
+	@Test // gh-63
+	fun awaitFirst() {
+
+		val spec = mockk<RowsFetchSpec<String>>()
+		every { spec.first() } returns Mono.just("foo")
+
+		runBlocking {
+			assertThat(spec.awaitFirst()).isEqualTo("foo")
+		}
+
+		verify {
+			spec.first()
+		}
+	}
 }