diff --git a/src/test/kotlin/org/springframework/data/redis/core/ReactiveGeoOperationsExtensionsUnitTests.kt b/src/test/kotlin/org/springframework/data/redis/core/ReactiveGeoOperationsExtensionsUnitTests.kt
index 3f8f1a462..5fd273b21 100644
--- a/src/test/kotlin/org/springframework/data/redis/core/ReactiveGeoOperationsExtensionsUnitTests.kt
+++ b/src/test/kotlin/org/springframework/data/redis/core/ReactiveGeoOperationsExtensionsUnitTests.kt
@@ -41,6 +41,7 @@ import reactor.core.publisher.Mono
  *
  * @author Mark Paluch
  * @author Christoph Strobl
+ * @author Sebastien Deleuze
  */
 class ReactiveGeoOperationsExtensionsUnitTests {
 
@@ -104,9 +105,10 @@ class ReactiveGeoOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun addGeoLocationFlow() {
+
 		val operations = mockk<ReactiveGeoOperations<String, String>>()
 		every { operations.add(any(), any<Publisher<List<GeoLocation<String>>>>()) } returns Flux.just(1)
 		val flow = flow { emit(listOf(GeoLocation("bar", Point(1.0, 2.0)))) }
@@ -271,9 +273,10 @@ class ReactiveGeoOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun radiusAsFlowCircle() {
+
 		val operations = mockk<ReactiveGeoOperations<String, String>>()
 		val result = GeoResult(GeoLocation("bar", Point(1.0, 2.0)), Distance(1.0))
 		val circle = Circle(1.0, 2.0, 3.0)
@@ -288,9 +291,10 @@ class ReactiveGeoOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun radiusAsFlowCircleAndArgs() {
+
 		val operations = mockk<ReactiveGeoOperations<String, String>>()
 		val result = GeoResult(GeoLocation("bar", Point(1.0, 2.0)), Distance(1.0))
 		val circle = Circle(1.0, 2.0, 3.0)
@@ -306,9 +310,10 @@ class ReactiveGeoOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun radiusAsFlowMemberAndRadius() {
+
 		val operations = mockk<ReactiveGeoOperations<String, String>>()
 		val result = GeoResult(GeoLocation("bar", Point(1.0, 2.0)), Distance(1.0))
 
@@ -323,9 +328,10 @@ class ReactiveGeoOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun radiusAsFlowDistance() {
+
 		val operations = mockk<ReactiveGeoOperations<String, String>>()
 		val result = GeoResult(GeoLocation("bar", Point(1.0, 2.0)), Distance(1.0))
 		val distance = Distance(2.0)
@@ -341,13 +347,14 @@ class ReactiveGeoOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun radiusAsFlowDistanceAndArgs() {
+
 		val operations = mockk<ReactiveGeoOperations<String, String>>()
 		val result = GeoResult(GeoLocation("bar", Point(1.0, 2.0)), Distance(1.0))
 		val distance = Distance(2.0)
-		val args = GeoRadiusCommandArgs.newGeoRadiusArgs()
+		val args = GeoRadiusCommandArgs.newGeoRadiusArgs().limit(1)
 
 		every { operations.radius(any(), any(), any(), any()) } returns Flux.just(result)
 
diff --git a/src/test/kotlin/org/springframework/data/redis/core/ReactiveHashOperationsExtensionsUnitTests.kt b/src/test/kotlin/org/springframework/data/redis/core/ReactiveHashOperationsExtensionsUnitTests.kt
index 31713baae..71b533d5f 100644
--- a/src/test/kotlin/org/springframework/data/redis/core/ReactiveHashOperationsExtensionsUnitTests.kt
+++ b/src/test/kotlin/org/springframework/data/redis/core/ReactiveHashOperationsExtensionsUnitTests.kt
@@ -31,6 +31,7 @@ import reactor.core.publisher.Mono
  *
  * @author Mark Paluch
  * @author Christoph Strobl
+ * @author Sebastien Deleuze
  */
 class ReactiveHashOperationsExtensionsUnitTests {
 
@@ -109,7 +110,7 @@ class ReactiveHashOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun keys() {
 		val operations = mockk<ReactiveHashOperations<String, String, String>>()
@@ -199,7 +200,7 @@ class ReactiveHashOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun values() {
 
@@ -215,7 +216,7 @@ class ReactiveHashOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun entries() {
 
@@ -232,7 +233,7 @@ class ReactiveHashOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun scan() {
 
diff --git a/src/test/kotlin/org/springframework/data/redis/core/ReactiveListOperationsExtensionsUnitTests.kt b/src/test/kotlin/org/springframework/data/redis/core/ReactiveListOperationsExtensionsUnitTests.kt
index 4ecd756d4..feebf4265 100644
--- a/src/test/kotlin/org/springframework/data/redis/core/ReactiveListOperationsExtensionsUnitTests.kt
+++ b/src/test/kotlin/org/springframework/data/redis/core/ReactiveListOperationsExtensionsUnitTests.kt
@@ -31,10 +31,11 @@ import java.time.Duration
  * Unit tests for `ReactiveListOperationsExtensions`
  *
  * @author Mark Paluch
+ * @author Sebastien Deleuze
  */
 class ReactiveListOperationsExtensionsUnitTests {
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun range() {
 
@@ -349,5 +350,4 @@ class ReactiveListOperationsExtensionsUnitTests {
 			operations.delete("foo")
 		}
 	}
-
 }
diff --git a/src/test/kotlin/org/springframework/data/redis/core/ReactiveRedisOperationsExtensionsUnitTests.kt b/src/test/kotlin/org/springframework/data/redis/core/ReactiveRedisOperationsExtensionsUnitTests.kt
index ab34974cf..e38343a6b 100644
--- a/src/test/kotlin/org/springframework/data/redis/core/ReactiveRedisOperationsExtensionsUnitTests.kt
+++ b/src/test/kotlin/org/springframework/data/redis/core/ReactiveRedisOperationsExtensionsUnitTests.kt
@@ -40,10 +40,11 @@ import java.time.Instant
  *
  * @author Mark Paluch
  * @author Christoph Strobl
+ * @author Sebastien Deleuze
  */
 class ReactiveRedisOperationsExtensionsUnitTests {
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun `execute with calllback`() {
 
@@ -59,7 +60,7 @@ class ReactiveRedisOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun `execute with script`() {
 
@@ -76,7 +77,7 @@ class ReactiveRedisOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun `execute with script, argsWriter and resultReader`() {
 
@@ -84,7 +85,7 @@ class ReactiveRedisOperationsExtensionsUnitTests {
 		val argsWriter = mockk<RedisElementWriter<Any>>(relaxed = true)
 		val resultReader = mockk<RedisElementReader<String>>(relaxed = true)
 		val operations = mockk<ReactiveRedisOperations<String, String>>()
-		every { operations.execute(any<RedisScript<*>>(), any(), any(), any(), any()) } returns Flux.just("foo")
+		every { operations.execute(any<RedisScript<String>>(), any(), any(), any(), any()) } returns Flux.just("foo")
 
 		runBlocking {
 			assertThat(operations.executeAsFlow(script, argsWriter = argsWriter, resultReader = resultReader).toList()).contains("foo")
@@ -110,7 +111,7 @@ class ReactiveRedisOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun listenToChannel() {
 
@@ -127,7 +128,7 @@ class ReactiveRedisOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun listenToPattern() {
 
@@ -144,7 +145,7 @@ class ReactiveRedisOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun listenTo() {
 
@@ -193,7 +194,7 @@ class ReactiveRedisOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun keys() {
 
@@ -209,7 +210,7 @@ class ReactiveRedisOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun scan() {
 
@@ -225,7 +226,6 @@ class ReactiveRedisOperationsExtensionsUnitTests {
 		}
 	}
 
-
 	@Test // DATAREDIS-937
 	fun randomKey() {
 
diff --git a/src/test/kotlin/org/springframework/data/redis/core/ReactiveSetOperationsExtensionsUnitTests.kt b/src/test/kotlin/org/springframework/data/redis/core/ReactiveSetOperationsExtensionsUnitTests.kt
index 4af0f9cf5..ce6e4c8c3 100644
--- a/src/test/kotlin/org/springframework/data/redis/core/ReactiveSetOperationsExtensionsUnitTests.kt
+++ b/src/test/kotlin/org/springframework/data/redis/core/ReactiveSetOperationsExtensionsUnitTests.kt
@@ -31,6 +31,7 @@ import reactor.core.publisher.Mono
  *
  * @author Mark Paluch
  * @author Christoph Strobl
+ * @author Sebastien Deleuze
  */
 class ReactiveSetOperationsExtensionsUnitTests {
 
@@ -79,7 +80,7 @@ class ReactiveSetOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun `pop as Flow`() {
 
@@ -155,7 +156,7 @@ class ReactiveSetOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun intersect() {
 		val operations = mockk<ReactiveSetOperations<String, String>>()
@@ -170,7 +171,7 @@ class ReactiveSetOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun `intersect with key and collection`() {
 		val operations = mockk<ReactiveSetOperations<String, String>>()
@@ -185,7 +186,7 @@ class ReactiveSetOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun `intersect with collection`() {
 		val operations = mockk<ReactiveSetOperations<String, String>>()
@@ -230,9 +231,10 @@ class ReactiveSetOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun union() {
+
 		val operations = mockk<ReactiveSetOperations<String, String>>()
 		every { operations.union("foo", "bar") } returns Flux.just("baz")
 
@@ -245,9 +247,10 @@ class ReactiveSetOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun `union with key and collection`() {
+
 		val operations = mockk<ReactiveSetOperations<String, String>>()
 		every { operations.union("foo", listOf("bar")) } returns Flux.just("baz")
 
@@ -260,9 +263,10 @@ class ReactiveSetOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun `union with collection`() {
+
 		val operations = mockk<ReactiveSetOperations<String, String>>()
 		every { operations.union(listOf("bar")) } returns Flux.just("baz")
 
@@ -305,9 +309,10 @@ class ReactiveSetOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun difference() {
+
 		val operations = mockk<ReactiveSetOperations<String, String>>()
 		every { operations.difference("foo", "bar") } returns Flux.just("baz")
 
@@ -320,9 +325,10 @@ class ReactiveSetOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun `difference with key and collection`() {
+
 		val operations = mockk<ReactiveSetOperations<String, String>>()
 		every { operations.difference("foo", listOf("bar")) } returns Flux.just("baz")
 
@@ -335,9 +341,10 @@ class ReactiveSetOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun `difference with collection`() {
+
 		val operations = mockk<ReactiveSetOperations<String, String>>()
 		every { operations.difference(listOf("bar")) } returns Flux.just("baz")
 
@@ -380,9 +387,10 @@ class ReactiveSetOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun members() {
+
 		val operations = mockk<ReactiveSetOperations<String, String>>()
 		every { operations.members("foo") } returns Flux.just("baz")
 
@@ -395,7 +403,7 @@ class ReactiveSetOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun scan() {
 
@@ -441,7 +449,7 @@ class ReactiveSetOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun distinctRandomMembers() {
 
@@ -457,7 +465,7 @@ class ReactiveSetOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun randomMembers() {
 
diff --git a/src/test/kotlin/org/springframework/data/redis/core/ReactiveStreamOperationsExtensionsUnitTests.kt b/src/test/kotlin/org/springframework/data/redis/core/ReactiveStreamOperationsExtensionsUnitTests.kt
index 399e84105..07d43e06e 100644
--- a/src/test/kotlin/org/springframework/data/redis/core/ReactiveStreamOperationsExtensionsUnitTests.kt
+++ b/src/test/kotlin/org/springframework/data/redis/core/ReactiveStreamOperationsExtensionsUnitTests.kt
@@ -35,6 +35,7 @@ import reactor.core.publisher.Mono
  * Unit tests for `ReactiveStreamOperationsExtensions`.
  *
  * @author Mark Paluch
+ * @author Sebastien Deleuze
  */
 class ReactiveStreamOperationsExtensionsUnitTests {
 
@@ -101,12 +102,11 @@ class ReactiveStreamOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun `add as Flow`() {
 
 		val map = mapOf("a" to "b")
-		val bodyPublisher = Mono.just(map)
 		val operations = mockk<ReactiveStreamOperations<String, String, String>>()
 		val recordId = RecordId.of("0-0")
 		every { operations.add(any(), any<Publisher<Map<String, String>>>()) } returns Flux.just(recordId)
@@ -260,7 +260,7 @@ class ReactiveStreamOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun range() {
 
@@ -278,7 +278,7 @@ class ReactiveStreamOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun rangeWithType() {
 
@@ -296,9 +296,10 @@ class ReactiveStreamOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun `read with StreamOffset vararg`() {
+
 		val offset1 = StreamOffset.create("foo", ReadOffset.lastConsumed())
 		val offset2 = StreamOffset.create("bar", ReadOffset.lastConsumed())
 		val record = MapRecord.create("foo", mapOf("a" to "b"))
@@ -314,9 +315,10 @@ class ReactiveStreamOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun `read with options and StreamOffset vararg` () {
+
 		val offset1 = StreamOffset.create("foo", ReadOffset.lastConsumed())
 		val offset2 = StreamOffset.create("bar", ReadOffset.lastConsumed())
 		val options = StreamReadOptions.empty()
@@ -333,9 +335,10 @@ class ReactiveStreamOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun `read with type and StreamOffset vararg`() {
+
 		val offset1 = StreamOffset.create("foo", ReadOffset.lastConsumed())
 		val offset2 = StreamOffset.create("bar", ReadOffset.lastConsumed())
 		val record = ObjectRecord.create("a", "b")
@@ -351,9 +354,10 @@ class ReactiveStreamOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun `read with type, options and StreamOffset vararg` () {
+
 		val offset1 = StreamOffset.create("foo", ReadOffset.lastConsumed())
 		val offset2 = StreamOffset.create("bar", ReadOffset.lastConsumed())
 		val options = StreamReadOptions.empty()
@@ -370,9 +374,10 @@ class ReactiveStreamOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun `read with consumer and StreamOffset vararg`() {
+
 		val consumer = Consumer.from("a", "b")
 		val offset1 = StreamOffset.create("foo", ReadOffset.lastConsumed())
 		val offset2 = StreamOffset.create("bar", ReadOffset.lastConsumed())
@@ -389,9 +394,10 @@ class ReactiveStreamOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun `read with consumer, options and StreamOffset vararg`() {
+
 		val consumer = Consumer.from("a", "b")
 		val offset1 = StreamOffset.create("foo", ReadOffset.lastConsumed())
 		val offset2 = StreamOffset.create("bar", ReadOffset.lastConsumed())
@@ -409,9 +415,10 @@ class ReactiveStreamOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun `read with type, consumer and StreamOffset vararg`() {
+
 		val consumer = Consumer.from("a", "b")
 		val offset1 = StreamOffset.create("foo", ReadOffset.lastConsumed())
 		val offset2 = StreamOffset.create("bar", ReadOffset.lastConsumed())
@@ -428,9 +435,10 @@ class ReactiveStreamOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun `read with type, consumer, options and StreamOffset vararg`() {
+
 		val consumer = Consumer.from("a", "b")
 		val offset1 = StreamOffset.create("foo", ReadOffset.lastConsumed())
 		val offset2 = StreamOffset.create("bar", ReadOffset.lastConsumed())
@@ -448,7 +456,7 @@ class ReactiveStreamOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun reverseRange() {
 
@@ -466,7 +474,7 @@ class ReactiveStreamOperationsExtensionsUnitTests {
 		}
 	}
 
-	@Test
+	@Test // DATAREDIS-1033
 	@ExperimentalCoroutinesApi
 	fun reverseRangeWithType() {