diff --git a/test/transforms/fixtures/at-current-range/unwrap-inline/across-blocks/index.js b/test/transforms/fixtures/at-current-range/unwrap-inline/across-blocks/index.js
index 49c6255e8..fa7f133bb 100644
--- a/test/transforms/fixtures/at-current-range/unwrap-inline/across-blocks/index.js
+++ b/test/transforms/fixtures/at-current-range/unwrap-inline/across-blocks/index.js
@@ -2,14 +2,11 @@
 import assert from 'assert'
 
 export default function (state) {
-  const { document, selection } = state
-  const texts = document.getTexts()
-  let first = texts.first()
-  const second = texts.last()
+  const { selection } = state
   const range = selection.merge({
-    anchorKey: first.key,
-    anchorOffset: 2,
-    focusKey: second.key,
+    anchorKey: 'anchor',
+    anchorOffset: 1,
+    focusKey: 'focus',
     focusOffset: 2
   })
 
@@ -19,15 +16,18 @@ export default function (state) {
     .unwrapInline('hashtag')
     .apply()
 
-  // Selection is reset, in theory it should me on the image
-  first = next.document.getTexts().first()
+  // Test selection
+  const { document } = next
+  const first = document.getTexts().first()
+  const last = document.getTexts().last()
+
   assert.deepEqual(
     next.selection.toJS(),
     range.merge({
         anchorKey: first.key,
-        anchorOffset: 0,
-        focusKey: first.key,
-        focusOffset: 0
+        anchorOffset: 1,
+        focusKey: last.key,
+        focusOffset: 4
     }).toJS()
   )
 
diff --git a/test/transforms/fixtures/at-current-range/unwrap-inline/across-blocks/input.yaml b/test/transforms/fixtures/at-current-range/unwrap-inline/across-blocks/input.yaml
index 57d48f74f..efe76eccf 100644
--- a/test/transforms/fixtures/at-current-range/unwrap-inline/across-blocks/input.yaml
+++ b/test/transforms/fixtures/at-current-range/unwrap-inline/across-blocks/input.yaml
@@ -4,6 +4,7 @@ nodes:
     type: paragraph
     nodes:
       - kind: text
+        key: 'anchor' # w[o
         text: wo
       - kind: inline
         type: hashtag
@@ -19,4 +20,5 @@ nodes:
           - kind: text
             text: an
       - kind: text
+        key: 'focus' # ot]her
         text: other
diff --git a/test/transforms/fixtures/at-current-range/unwrap-inline/across-blocks/output.yaml b/test/transforms/fixtures/at-current-range/unwrap-inline/across-blocks/output.yaml
index 881deb1d9..612d61ee1 100644
--- a/test/transforms/fixtures/at-current-range/unwrap-inline/across-blocks/output.yaml
+++ b/test/transforms/fixtures/at-current-range/unwrap-inline/across-blocks/output.yaml
@@ -10,3 +10,5 @@ nodes:
     nodes:
       - kind: text
         text: another
+# Selection
+# w[ordanot]her
\ No newline at end of file
diff --git a/test/transforms/fixtures/at-current-range/unwrap-inline/nested-block/index.js b/test/transforms/fixtures/at-current-range/unwrap-inline/nested-block/index.js
index 80ede57bf..6b8cc9d94 100644
--- a/test/transforms/fixtures/at-current-range/unwrap-inline/nested-block/index.js
+++ b/test/transforms/fixtures/at-current-range/unwrap-inline/nested-block/index.js
@@ -2,14 +2,11 @@
 import assert from 'assert'
 
 export default function (state) {
-  const { document, selection } = state
-  const texts = document.getTexts()
-  const first = texts.first()
-  const last = texts.get(1)
+  const { selection } = state
   const range = selection.merge({
-    anchorKey: first.key,
+    anchorKey: 'anchor',
     anchorOffset: 1,
-    focusKey: last.key,
+    focusKey: 'focus',
     focusOffset: 2
   })
 
@@ -21,7 +18,10 @@ export default function (state) {
 
   assert.deepEqual(
     next.selection.toJS(),
-    range.collapseToStartOf(next.document).toJS()
+    range.merge({
+      focusKey: 'anchor',
+      focusOffset: 3
+    }).toJS()
   )
 
   return next
diff --git a/test/transforms/fixtures/at-current-range/unwrap-inline/nested-block/input.yaml b/test/transforms/fixtures/at-current-range/unwrap-inline/nested-block/input.yaml
index dda085eb1..bace31d67 100644
--- a/test/transforms/fixtures/at-current-range/unwrap-inline/nested-block/input.yaml
+++ b/test/transforms/fixtures/at-current-range/unwrap-inline/nested-block/input.yaml
@@ -7,11 +7,15 @@ nodes:
         type: paragraph
         nodes:
           - kind: text
+            key: 'anchor'
             text: w
           - kind: inline
             type: hashtag
             nodes:
               - kind: text
+                key: 'focus'
                 text: or
           - kind: text
             text: d
+# Selection
+# w[or]d
\ No newline at end of file
diff --git a/test/transforms/fixtures/at-current-range/unwrap-inline/only-one/index.js b/test/transforms/fixtures/at-current-range/unwrap-inline/only-one/index.js
index 2c11e5ddd..221ab5fed 100644
--- a/test/transforms/fixtures/at-current-range/unwrap-inline/only-one/index.js
+++ b/test/transforms/fixtures/at-current-range/unwrap-inline/only-one/index.js
@@ -2,14 +2,11 @@
 import assert from 'assert'
 
 export default function (state) {
-  const { document, selection } = state
-  const texts = document.getTexts()
-  const first = texts.get(2)
-  const last = texts.get(3)
+  const { selection } = state
   const range = selection.merge({
-    anchorKey: first.key,
+    anchorKey: 'anchor',
     anchorOffset: 2,
-    focusKey: last.key,
+    focusKey: 'focus',
     focusOffset: 2
   })
 
@@ -21,7 +18,10 @@ export default function (state) {
 
   assert.deepEqual(
     next.selection.toJS(),
-    range.collapseToStartOf(next.document).toJS()
+    range.merge({
+      focusKey: 'anchor',
+      focusOffset: 5
+    }).toJS()
   )
 
   return next
diff --git a/test/transforms/fixtures/at-current-range/unwrap-inline/only-one/input.yaml b/test/transforms/fixtures/at-current-range/unwrap-inline/only-one/input.yaml
index d93ed90ad..a21510e72 100644
--- a/test/transforms/fixtures/at-current-range/unwrap-inline/only-one/input.yaml
+++ b/test/transforms/fixtures/at-current-range/unwrap-inline/only-one/input.yaml
@@ -11,11 +11,16 @@ nodes:
           - kind: text
             text: ll
       - kind: text
+        key: 'anchor'
         text: "o w"
       - kind: inline
         type: hashtag
         nodes:
           - kind: text
+            key: 'focus'
             text: or
       - kind: text
         text: d
+
+# Selection
+# hello [wor]d
\ No newline at end of file
diff --git a/test/transforms/fixtures/at-current-range/unwrap-inline/only-one/output.yaml b/test/transforms/fixtures/at-current-range/unwrap-inline/only-one/output.yaml
index 80cea6855..046a57fc0 100644
--- a/test/transforms/fixtures/at-current-range/unwrap-inline/only-one/output.yaml
+++ b/test/transforms/fixtures/at-current-range/unwrap-inline/only-one/output.yaml
@@ -12,3 +12,5 @@ nodes:
             text: ll
       - kind: text
         text: "o word"
+# Selection
+# hello [wor]d
\ No newline at end of file
diff --git a/test/transforms/fixtures/at-current-range/unwrap-inline/single-block/index.js b/test/transforms/fixtures/at-current-range/unwrap-inline/single-block/index.js
index 80ede57bf..6b8cc9d94 100644
--- a/test/transforms/fixtures/at-current-range/unwrap-inline/single-block/index.js
+++ b/test/transforms/fixtures/at-current-range/unwrap-inline/single-block/index.js
@@ -2,14 +2,11 @@
 import assert from 'assert'
 
 export default function (state) {
-  const { document, selection } = state
-  const texts = document.getTexts()
-  const first = texts.first()
-  const last = texts.get(1)
+  const { selection } = state
   const range = selection.merge({
-    anchorKey: first.key,
+    anchorKey: 'anchor',
     anchorOffset: 1,
-    focusKey: last.key,
+    focusKey: 'focus',
     focusOffset: 2
   })
 
@@ -21,7 +18,10 @@ export default function (state) {
 
   assert.deepEqual(
     next.selection.toJS(),
-    range.collapseToStartOf(next.document).toJS()
+    range.merge({
+      focusKey: 'anchor',
+      focusOffset: 3
+    }).toJS()
   )
 
   return next
diff --git a/test/transforms/fixtures/at-current-range/unwrap-inline/single-block/input.yaml b/test/transforms/fixtures/at-current-range/unwrap-inline/single-block/input.yaml
index 7bfbe8b4b..1e1a75bbb 100644
--- a/test/transforms/fixtures/at-current-range/unwrap-inline/single-block/input.yaml
+++ b/test/transforms/fixtures/at-current-range/unwrap-inline/single-block/input.yaml
@@ -4,11 +4,16 @@ nodes:
     type: paragraph
     nodes:
       - kind: text
+        key: 'anchor'
         text: w
       - kind: inline
         type: hashtag
         nodes:
           - kind: text
+            key: 'focus'
             text: or
       - kind: text
         text: d
+
+# selection:
+# w[or]d
\ No newline at end of file