diff --git a/src/main/asciidoc/reference/redis-streams.adoc b/src/main/asciidoc/reference/redis-streams.adoc
index 254bbb6f1..0574d7024 100644
--- a/src/main/asciidoc/reference/redis-streams.adoc
+++ b/src/main/asciidoc/reference/redis-streams.adoc
@@ -249,7 +249,7 @@ List<ObjectRecord<String, String>> records = redisTemplate()
     .opsForStream()
     .read(String.class, StreamOffset.fromStart("my-stream"));
 ----
-<1> XADD my-stream * "_class" "com.example.User" "firstname" "night" "lastname" "angel"
+<1> XADD my-stream * "_class" "java.lang.String" "_raw" "my-value"
 
 ``ObjectRecord``s pass through the very same serialization process as the all other records, thus the Record can also obtained using the untyped read operation returning a `MapRecord`.
 
diff --git a/src/test/java/org/springframework/data/redis/mapping/ObjectHashMapperTests.java b/src/test/java/org/springframework/data/redis/mapping/ObjectHashMapperTests.java
index 9e3f20830..c09b39952 100644
--- a/src/test/java/org/springframework/data/redis/mapping/ObjectHashMapperTests.java
+++ b/src/test/java/org/springframework/data/redis/mapping/ObjectHashMapperTests.java
@@ -22,7 +22,7 @@ import lombok.Data;
 import java.util.Collections;
 import java.util.Map;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.data.annotation.TypeAlias;
 import org.springframework.data.redis.core.convert.MappingRedisConverter;
 import org.springframework.data.redis.core.mapping.RedisMappingContext;
@@ -32,19 +32,19 @@ import org.springframework.data.redis.hash.ObjectHashMapper;
  * @author Christoph Strobl
  * @author Mark Paluch
  */
-public class ObjectHashMapperTests extends AbstractHashMapperTest {
+class ObjectHashMapperTests extends AbstractHashMapperTest {
 
 	protected ObjectHashMapper mapperFor(Class t) {
 		return new ObjectHashMapper();
 	}
 
 	@Test // DATAREDIS-503
-	public void testSimpleType() {
+	void testSimpleType() {
 		assertBackAndForwardMapping(new Integer(100));
 	}
 
 	@Test // DATAREDIS-503
-	public void fromHashShouldCastToType() {
+	void fromHashShouldCastToType() {
 
 		ObjectHashMapper objectHashMapper = new ObjectHashMapper();
 		Map<byte[], byte[]> hash = objectHashMapper.toHash(new Integer(100));
@@ -54,17 +54,17 @@ public class ObjectHashMapperTests extends AbstractHashMapperTest {
 		assertThat(result).isEqualTo(new Integer(100));
 	}
 
-	@Test(expected = ClassCastException.class) // DATAREDIS-503
-	public void fromHashShouldFailIfTypeDoesNotMatch() {
+	@Test // DATAREDIS-503
+	void fromHashShouldFailIfTypeDoesNotMatch() {
 
 		ObjectHashMapper objectHashMapper = new ObjectHashMapper();
 		Map<byte[], byte[]> hash = objectHashMapper.toHash(new Integer(100));
 
-		String result = objectHashMapper.fromHash(hash, String.class);
+		assertThatExceptionOfType(ClassCastException.class).isThrownBy(() -> objectHashMapper.fromHash(hash, String.class));
 	}
 
 	@Test // DATAREDIS-1179
-	public void hashMapperAllowsReuseOfRedisConverter/*and thus the MappingContext holding eg. TypeAlias information*/() {
+	void hashMapperAllowsReuseOfRedisConverter/*and thus the MappingContext holding eg. TypeAlias information*/() {
 
 		WithTypeAlias source = new WithTypeAlias();
 		source.value = "val";