diff --git a/test/compose/undo-multi-replace-at-end/selections b/test/compose/undo-multi-replace-at-end/selections
index 48fcc423..d70e1ba3 100644
--- a/test/compose/undo-multi-replace-at-end/selections
+++ b/test/compose/undo-multi-replace-at-end/selections
@@ -1,2 +1,2 @@
-line 2
-line 3
+'line 2
+line 3'
diff --git a/test/normal/all/selections b/test/normal/all/selections
index 8709f804..da3c324d 100644
--- a/test/normal/all/selections
+++ b/test/normal/all/selections
@@ -1,5 +1,5 @@
-a
+'a
 b
 c
 d
-
+'
diff --git a/test/normal/append/selections b/test/normal/append/selections
index 2591812f..3e67d566 100644
--- a/test/normal/append/selections
+++ b/test/normal/append/selections
@@ -1,2 +1,2 @@
-append
-
+'append
+'
diff --git a/test/normal/clear-selections/selections b/test/normal/clear-selections/selections
index 13e7564e..86c7b6a1 100644
--- a/test/normal/clear-selections/selections
+++ b/test/normal/clear-selections/selections
@@ -1 +1 @@
-o
+'o'
diff --git a/test/normal/codepoint-width/tab-width/selections b/test/normal/codepoint-width/tab-width/selections
index ec635144..5b89320d 100644
--- a/test/normal/codepoint-width/tab-width/selections
+++ b/test/normal/codepoint-width/tab-width/selections
@@ -1 +1 @@
-9
+'9'
diff --git a/test/normal/codepoint-width/vertical-movement/selections b/test/normal/codepoint-width/vertical-movement/selections
index 564e0714..27b5ebfe 100644
--- a/test/normal/codepoint-width/vertical-movement/selections
+++ b/test/normal/codepoint-width/vertical-movement/selections
@@ -1 +1 @@
-3:7
+'3' '7'
diff --git a/test/normal/copy-sel-above/selections b/test/normal/copy-sel-above/selections
index 49f37f3d..45d79f3b 100644
--- a/test/normal/copy-sel-above/selections
+++ b/test/normal/copy-sel-above/selections
@@ -1 +1 @@
-foo:bar:baz
+'foo' 'bar' 'baz'
diff --git a/test/normal/copy-sel-below-multi-line/selections b/test/normal/copy-sel-below-multi-line/selections
index a5eb1024..a0ed8fb8 100644
--- a/test/normal/copy-sel-below-multi-line/selections
+++ b/test/normal/copy-sel-below-multi-line/selections
@@ -1,4 +1,4 @@
-foo
-bar:bar
-baz:qux
-foo
+'foo
+bar' 'bar
+baz' 'qux
+foo'
diff --git a/test/normal/copy-sel-below/selections b/test/normal/copy-sel-below/selections
index 49f37f3d..45d79f3b 100644
--- a/test/normal/copy-sel-below/selections
+++ b/test/normal/copy-sel-below/selections
@@ -1 +1 @@
-foo:bar:baz
+'foo' 'bar' 'baz'
diff --git a/test/normal/extend-lines/selections b/test/normal/extend-lines/selections
index 2c9a6f3f..65bdcd40 100644
--- a/test/normal/extend-lines/selections
+++ b/test/normal/extend-lines/selections
@@ -1,4 +1,4 @@
-one line
+'one line
 two lines
 three lines
-
+'
diff --git a/test/normal/extra-word-chars/selections b/test/normal/extra-word-chars/selections
index 05122515..da11edba 100644
--- a/test/normal/extra-word-chars/selections
+++ b/test/normal/extra-word-chars/selections
@@ -1 +1 @@
-another'one
+'another''one'
diff --git a/test/normal/find-char-backward-extending/selections b/test/normal/find-char-backward-extending/selections
index 8e85b581..84caf089 100644
--- a/test/normal/find-char-backward-extending/selections
+++ b/test/normal/find-char-backward-extending/selections
@@ -1 +1 @@
-|b
+'|b'
diff --git a/test/normal/find-char-backward/selections b/test/normal/find-char-backward/selections
index cecd2dec..118347bb 100644
--- a/test/normal/find-char-backward/selections
+++ b/test/normal/find-char-backward/selections
@@ -1 +1 @@
-|bar
+'|bar'
diff --git a/test/normal/find-char-forward-extending/selections b/test/normal/find-char-forward-extending/selections
index b9f1b3f0..7bdb3541 100644
--- a/test/normal/find-char-forward-extending/selections
+++ b/test/normal/find-char-forward-extending/selections
@@ -1 +1 @@
-bar|
+'bar|'
diff --git a/test/normal/find-char-forward/selections b/test/normal/find-char-forward/selections
index 46e2eef4..6c9923ad 100644
--- a/test/normal/find-char-forward/selections
+++ b/test/normal/find-char-forward/selections
@@ -1 +1 @@
-r|
+'r|'
diff --git a/test/normal/goto-extending/buffer-bottom/selections b/test/normal/goto-extending/buffer-bottom/selections
index 4a71b15a..8d0f16bb 100644
--- a/test/normal/goto-extending/buffer-bottom/selections
+++ b/test/normal/goto-extending/buffer-bottom/selections
@@ -1,2 +1,2 @@
-bar
-b
+'bar
+b'
diff --git a/test/normal/goto-extending/buffer-end/selections b/test/normal/goto-extending/buffer-end/selections
index 059c57a9..a5aa2d66 100644
--- a/test/normal/goto-extending/buffer-end/selections
+++ b/test/normal/goto-extending/buffer-end/selections
@@ -1,3 +1,3 @@
-bar
+'bar
 baz
-
+'
diff --git a/test/normal/goto-extending/buffer-top/selections b/test/normal/goto-extending/buffer-top/selections
index e512e1b5..33048dec 100644
--- a/test/normal/goto-extending/buffer-top/selections
+++ b/test/normal/goto-extending/buffer-top/selections
@@ -1,2 +1,2 @@
-foo
-b
+'foo
+b'
diff --git a/test/normal/goto-extending/last-change/selections b/test/normal/goto-extending/last-change/selections
index 333dc6b4..b1ff6dce 100644
--- a/test/normal/goto-extending/last-change/selections
+++ b/test/normal/goto-extending/last-change/selections
@@ -1,3 +1,3 @@
-foo
-
+'foo
 
+'
diff --git a/test/normal/goto-extending/line-begin/selections b/test/normal/goto-extending/line-begin/selections
index 20b4d26d..9f718fc9 100644
--- a/test/normal/goto-extending/line-begin/selections
+++ b/test/normal/goto-extending/line-begin/selections
@@ -1 +1 @@
-foo b
+'foo b'
diff --git a/test/normal/goto-extending/line-end/selections b/test/normal/goto-extending/line-end/selections
index 1da92a26..6d3a5b42 100644
--- a/test/normal/goto-extending/line-end/selections
+++ b/test/normal/goto-extending/line-end/selections
@@ -1 +1 @@
-bar baz
+'bar baz'
diff --git a/test/normal/goto/buffer-bottom/selections b/test/normal/goto/buffer-bottom/selections
index 61780798..0bdc348b 100644
--- a/test/normal/goto/buffer-bottom/selections
+++ b/test/normal/goto/buffer-bottom/selections
@@ -1 +1 @@
-b
+'b'
diff --git a/test/normal/goto/buffer-end/selections b/test/normal/goto/buffer-end/selections
index 139597f9..1b0a989d 100644
--- a/test/normal/goto/buffer-end/selections
+++ b/test/normal/goto/buffer-end/selections
@@ -1,2 +1,2 @@
-
-
+'
+'
diff --git a/test/normal/goto/buffer-top/selections b/test/normal/goto/buffer-top/selections
index 6a69f920..44d08a16 100644
--- a/test/normal/goto/buffer-top/selections
+++ b/test/normal/goto/buffer-top/selections
@@ -1 +1 @@
-f
+'f'
diff --git a/test/normal/goto/last-change/selections b/test/normal/goto/last-change/selections
index 139597f9..1b0a989d 100644
--- a/test/normal/goto/last-change/selections
+++ b/test/normal/goto/last-change/selections
@@ -1,2 +1,2 @@
-
-
+'
+'
diff --git a/test/normal/goto/line-begin/selections b/test/normal/goto/line-begin/selections
index 6a69f920..44d08a16 100644
--- a/test/normal/goto/line-begin/selections
+++ b/test/normal/goto/line-begin/selections
@@ -1 +1 @@
-f
+'f'
diff --git a/test/normal/goto/line-end/selections b/test/normal/goto/line-end/selections
index b6802534..6ad22b40 100644
--- a/test/normal/goto/line-end/selections
+++ b/test/normal/goto/line-end/selections
@@ -1 +1 @@
-z
+'z'
diff --git a/test/normal/keep-cmd/selections b/test/normal/keep-cmd/selections
index ae3cdf5b..57f09b9e 100644
--- a/test/normal/keep-cmd/selections
+++ b/test/normal/keep-cmd/selections
@@ -1 +1 @@
-foo:bar
+'foo' 'bar'
diff --git a/test/normal/lower-case/selections b/test/normal/lower-case/selections
index 257cc564..c2c4af01 100644
--- a/test/normal/lower-case/selections
+++ b/test/normal/lower-case/selections
@@ -1 +1 @@
-foo
+'foo'
diff --git a/test/normal/match-char/selections b/test/normal/match-char/selections
index 75e0e0c5..9d2552e1 100644
--- a/test/normal/match-char/selections
+++ b/test/normal/match-char/selections
@@ -1 +1 @@
-(a, b)
+'(a, b)'
diff --git a/test/normal/move/down-extending/selections b/test/normal/move/down-extending/selections
index 3bd1f0e2..11d30f3e 100644
--- a/test/normal/move/down-extending/selections
+++ b/test/normal/move/down-extending/selections
@@ -1,2 +1,2 @@
-foo
-bar
+'foo
+bar'
diff --git a/test/normal/move/down/selections b/test/normal/move/down/selections
index 4286f428..95b1da7d 100644
--- a/test/normal/move/down/selections
+++ b/test/normal/move/down/selections
@@ -1 +1 @@
-r
+'r'
diff --git a/test/normal/move/left-extending/selections b/test/normal/move/left-extending/selections
index 86ae29c8..096c39e1 100644
--- a/test/normal/move/left-extending/selections
+++ b/test/normal/move/left-extending/selections
@@ -1 +1 @@
-ba
+'ba'
diff --git a/test/normal/move/left/selections b/test/normal/move/left/selections
index 78981922..67fe32da 100644
--- a/test/normal/move/left/selections
+++ b/test/normal/move/left/selections
@@ -1 +1 @@
-a
+'a'
diff --git a/test/normal/move/right-extending/selections b/test/normal/move/right-extending/selections
index 564d4dda..576e9657 100644
--- a/test/normal/move/right-extending/selections
+++ b/test/normal/move/right-extending/selections
@@ -1 +1 @@
-foo 
+'foo '
diff --git a/test/normal/move/right/selections b/test/normal/move/right/selections
index 8d1c8b69..ccb11425 100644
--- a/test/normal/move/right/selections
+++ b/test/normal/move/right/selections
@@ -1 +1 @@
- 
+' '
diff --git a/test/normal/move/up-extending/selections b/test/normal/move/up-extending/selections
index 031360a8..356e3c15 100644
--- a/test/normal/move/up-extending/selections
+++ b/test/normal/move/up-extending/selections
@@ -1,2 +1,2 @@
-o
-b
+'o
+b'
diff --git a/test/normal/move/up/selections b/test/normal/move/up/selections
index 13e7564e..86c7b6a1 100644
--- a/test/normal/move/up/selections
+++ b/test/normal/move/up/selections
@@ -1 +1 @@
-o
+'o'
diff --git a/test/normal/next-big-word-extending/selections b/test/normal/next-big-word-extending/selections
index 5cab843c..8c5d31b9 100644
--- a/test/normal/next-big-word-extending/selections
+++ b/test/normal/next-big-word-extending/selections
@@ -1 +1 @@
-foo bar-baz 
+'foo bar-baz '
diff --git a/test/normal/next-big-word/selections b/test/normal/next-big-word/selections
index d6311946..6a412ffd 100644
--- a/test/normal/next-big-word/selections
+++ b/test/normal/next-big-word/selections
@@ -1 +1 @@
-bar-baz 
+'bar-baz '
diff --git a/test/normal/next-match-appending/selections b/test/normal/next-match-appending/selections
index ae3cdf5b..57f09b9e 100644
--- a/test/normal/next-match-appending/selections
+++ b/test/normal/next-match-appending/selections
@@ -1 +1 @@
-foo:bar
+'foo' 'bar'
diff --git a/test/normal/next-match/selections b/test/normal/next-match/selections
index 5716ca59..2cde735c 100644
--- a/test/normal/next-match/selections
+++ b/test/normal/next-match/selections
@@ -1 +1 @@
-bar
+'bar'
diff --git a/test/normal/next-word-extending/selections b/test/normal/next-word-extending/selections
index cc995e23..2781ae88 100644
--- a/test/normal/next-word-extending/selections
+++ b/test/normal/next-word-extending/selections
@@ -1 +1 @@
-foo bar 
+'foo bar '
diff --git a/test/normal/next-word/selections b/test/normal/next-word/selections
index efe82b7c..563b99d2 100644
--- a/test/normal/next-word/selections
+++ b/test/normal/next-word/selections
@@ -1 +1 @@
-bar 
+'bar '
diff --git a/test/normal/object/around-parent/angle/selections b/test/normal/object/around-parent/angle/selections
index 39e2e89a..5cc04c44 100644
--- a/test/normal/object/around-parent/angle/selections
+++ b/test/normal/object/around-parent/angle/selections
@@ -1 +1 @@
-<foo <foo> >
+'<foo <foo> >'
diff --git a/test/normal/object/around-parent/braces/selections b/test/normal/object/around-parent/braces/selections
index e363839a..9c84d03b 100644
--- a/test/normal/object/around-parent/braces/selections
+++ b/test/normal/object/around-parent/braces/selections
@@ -1,3 +1,3 @@
-{
-  "foo"\: { "bar" }
-}
+'{
+  "foo": { "bar" }
+}'
diff --git a/test/normal/object/around-parent/brackets/selections b/test/normal/object/around-parent/brackets/selections
index 4cbf7ffd..40c10e34 100644
--- a/test/normal/object/around-parent/brackets/selections
+++ b/test/normal/object/around-parent/brackets/selections
@@ -1,3 +1,3 @@
-[
+'[
   ["foo"]
-]
+]'
diff --git a/test/normal/object/around-parent/parenthesis/selections b/test/normal/object/around-parent/parenthesis/selections
index 9f9cd966..d69eb640 100644
--- a/test/normal/object/around-parent/parenthesis/selections
+++ b/test/normal/object/around-parent/parenthesis/selections
@@ -1 +1 @@
-(foo(bar))
+'(foo(bar))'
diff --git a/test/normal/object/around/angle/selections b/test/normal/object/around/angle/selections
index 9127b708..05db58e8 100644
--- a/test/normal/object/around/angle/selections
+++ b/test/normal/object/around/angle/selections
@@ -1 +1 @@
-<foo>
+'<foo>'
diff --git a/test/normal/object/around/argument/multi-level/selections b/test/normal/object/around/argument/multi-level/selections
index a05ae945..0db913f5 100644
--- a/test/normal/object/around/argument/multi-level/selections
+++ b/test/normal/object/around/argument/multi-level/selections
@@ -1 +1 @@
- (and some, blub and),
+' (and some, blub and),'
diff --git a/test/normal/object/around/argument/single-level/selections b/test/normal/object/around/argument/single-level/selections
index bf023481..a31950be 100644
--- a/test/normal/object/around/argument/single-level/selections
+++ b/test/normal/object/around/argument/single-level/selections
@@ -1 +1 @@
- "something",
+' "something",'
diff --git a/test/normal/object/around/big-word/selections b/test/normal/object/around/big-word/selections
index d6311946..6a412ffd 100644
--- a/test/normal/object/around/big-word/selections
+++ b/test/normal/object/around/big-word/selections
@@ -1 +1 @@
-bar-baz 
+'bar-baz '
diff --git a/test/normal/object/around/braces/selections b/test/normal/object/around/braces/selections
index 56cc1e77..3f3e6a2d 100644
--- a/test/normal/object/around/braces/selections
+++ b/test/normal/object/around/braces/selections
@@ -1,3 +1,3 @@
-{
-  "foo"\: "bar"
-}
+'{
+  "foo": "bar"
+}'
diff --git a/test/normal/object/around/brackets/selections b/test/normal/object/around/brackets/selections
index de140ba3..f5c995b1 100644
--- a/test/normal/object/around/brackets/selections
+++ b/test/normal/object/around/brackets/selections
@@ -1,3 +1,3 @@
-[
+'[
   "foo"
-]
+]'
diff --git a/test/normal/object/around/double_quote/selections b/test/normal/object/around/double_quote/selections
index 196e5879..e7cafe44 100644
--- a/test/normal/object/around/double_quote/selections
+++ b/test/normal/object/around/double_quote/selections
@@ -1 +1 @@
-"bar"
+'"bar"'
diff --git a/test/normal/object/around/grave_quote/selections b/test/normal/object/around/grave_quote/selections
index 347253a0..a84a6be9 100644
--- a/test/normal/object/around/grave_quote/selections
+++ b/test/normal/object/around/grave_quote/selections
@@ -1 +1 @@
-`foo`
+'`foo`'
diff --git a/test/normal/object/around/indent/selections b/test/normal/object/around/indent/selections
index 80196fbb..a5967a8b 100644
--- a/test/normal/object/around/indent/selections
+++ b/test/normal/object/around/indent/selections
@@ -1,4 +1,4 @@
-
+'
   foo(bar)
 
-
+'
diff --git a/test/normal/object/around/paragraph/selections b/test/normal/object/around/paragraph/selections
index 2887a9d6..e697db0a 100644
--- a/test/normal/object/around/paragraph/selections
+++ b/test/normal/object/around/paragraph/selections
@@ -1,4 +1,4 @@
-c
+'c
 d
 
-
+'
diff --git a/test/normal/object/around/parenthesis/selections b/test/normal/object/around/parenthesis/selections
index c115b234..a12796f9 100644
--- a/test/normal/object/around/parenthesis/selections
+++ b/test/normal/object/around/parenthesis/selections
@@ -1 +1 @@
-(bar)
+'(bar)'
diff --git a/test/normal/object/around/sentence/selections b/test/normal/object/around/sentence/selections
index 5dd13409..d60bfff4 100644
--- a/test/normal/object/around/sentence/selections
+++ b/test/normal/object/around/sentence/selections
@@ -1,2 +1,2 @@
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor
-incididunt ut labore et dolore magna aliqua.  
+'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor
+incididunt ut labore et dolore magna aliqua.  '
diff --git a/test/normal/object/around/single_quote/selections b/test/normal/object/around/single_quote/selections
index 2cde735c..80eca1d8 100644
--- a/test/normal/object/around/single_quote/selections
+++ b/test/normal/object/around/single_quote/selections
@@ -1 +1 @@
-'bar'
+'''bar'''
diff --git a/test/normal/object/around/slash/selections b/test/normal/object/around/slash/selections
index a5a08411..53f23522 100644
--- a/test/normal/object/around/slash/selections
+++ b/test/normal/object/around/slash/selections
@@ -1 +1 @@
-/bar/
+'/bar/'
diff --git a/test/normal/object/around/word/selections b/test/normal/object/around/word/selections
index efe82b7c..563b99d2 100644
--- a/test/normal/object/around/word/selections
+++ b/test/normal/object/around/word/selections
@@ -1 +1 @@
-bar 
+'bar '
diff --git a/test/normal/object/drop-non-whitespace/selections b/test/normal/object/drop-non-whitespace/selections
index 8c68ee72..edd6cc64 100644
--- a/test/normal/object/drop-non-whitespace/selections
+++ b/test/normal/object/drop-non-whitespace/selections
@@ -1 +1 @@
-   : 
+'   ' ' '
diff --git a/test/normal/object/end-extending/angle/selections b/test/normal/object/end-extending/angle/selections
index 1bd5e5cc..d0ecfe73 100644
--- a/test/normal/object/end-extending/angle/selections
+++ b/test/normal/object/end-extending/angle/selections
@@ -1 +1 @@
-foo>
+'foo>'
diff --git a/test/normal/object/end-extending/argument/selections b/test/normal/object/end-extending/argument/selections
index cf43e724..dea38232 100644
--- a/test/normal/object/end-extending/argument/selections
+++ b/test/normal/object/end-extending/argument/selections
@@ -1 +1 @@
-some stuff,
+'some stuff,'
diff --git a/test/normal/object/end-extending/big-word/selections b/test/normal/object/end-extending/big-word/selections
index d6311946..6a412ffd 100644
--- a/test/normal/object/end-extending/big-word/selections
+++ b/test/normal/object/end-extending/big-word/selections
@@ -1 +1 @@
-bar-baz 
+'bar-baz '
diff --git a/test/normal/object/end-extending/braces/selections b/test/normal/object/end-extending/braces/selections
index a729b60b..ec1cbe74 100644
--- a/test/normal/object/end-extending/braces/selections
+++ b/test/normal/object/end-extending/braces/selections
@@ -1,2 +1,2 @@
-foo"\: "bar"
-}
+'foo": "bar"
+}'
diff --git a/test/normal/object/end-extending/brackets/selections b/test/normal/object/end-extending/brackets/selections
index 0ca681c5..5c001b80 100644
--- a/test/normal/object/end-extending/brackets/selections
+++ b/test/normal/object/end-extending/brackets/selections
@@ -1,2 +1,2 @@
-foo"
-]
+'foo"
+]'
diff --git a/test/normal/object/end-extending/double_quote/selections b/test/normal/object/end-extending/double_quote/selections
index d9f07fc6..e0d7da86 100644
--- a/test/normal/object/end-extending/double_quote/selections
+++ b/test/normal/object/end-extending/double_quote/selections
@@ -1 +1 @@
-bar"
+'bar"'
diff --git a/test/normal/object/end-extending/grave_quote/selections b/test/normal/object/end-extending/grave_quote/selections
index b380d541..9c7eb431 100644
--- a/test/normal/object/end-extending/grave_quote/selections
+++ b/test/normal/object/end-extending/grave_quote/selections
@@ -1 +1 @@
-foo`
+'foo`'
diff --git a/test/normal/object/end-extending/indent/selections b/test/normal/object/end-extending/indent/selections
index 9569a91f..95d8e408 100644
--- a/test/normal/object/end-extending/indent/selections
+++ b/test/normal/object/end-extending/indent/selections
@@ -1,3 +1,3 @@
-bar)
-
+'bar)
 
+'
diff --git a/test/normal/object/end-extending/paragraph/selections b/test/normal/object/end-extending/paragraph/selections
index 2887a9d6..e697db0a 100644
--- a/test/normal/object/end-extending/paragraph/selections
+++ b/test/normal/object/end-extending/paragraph/selections
@@ -1,4 +1,4 @@
-c
+'c
 d
 
-
+'
diff --git a/test/normal/object/end-extending/parenthesis/selections b/test/normal/object/end-extending/parenthesis/selections
index 05b3995d..f0da72b7 100644
--- a/test/normal/object/end-extending/parenthesis/selections
+++ b/test/normal/object/end-extending/parenthesis/selections
@@ -1 +1 @@
-bar)
+'bar)'
diff --git a/test/normal/object/end-extending/sentence/selections b/test/normal/object/end-extending/sentence/selections
index 5dd13409..d60bfff4 100644
--- a/test/normal/object/end-extending/sentence/selections
+++ b/test/normal/object/end-extending/sentence/selections
@@ -1,2 +1,2 @@
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor
-incididunt ut labore et dolore magna aliqua.  
+'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor
+incididunt ut labore et dolore magna aliqua.  '
diff --git a/test/normal/object/end-extending/single_quote/selections b/test/normal/object/end-extending/single_quote/selections
index 7ca0922b..6a555c9b 100644
--- a/test/normal/object/end-extending/single_quote/selections
+++ b/test/normal/object/end-extending/single_quote/selections
@@ -1 +1 @@
-bar'
+'bar'''
diff --git a/test/normal/object/end-extending/word/selections b/test/normal/object/end-extending/word/selections
index efe82b7c..563b99d2 100644
--- a/test/normal/object/end-extending/word/selections
+++ b/test/normal/object/end-extending/word/selections
@@ -1 +1 @@
-bar 
+'bar '
diff --git a/test/normal/object/end/angle/selections b/test/normal/object/end/angle/selections
index 286188d9..d8f2d171 100644
--- a/test/normal/object/end/angle/selections
+++ b/test/normal/object/end/angle/selections
@@ -1 +1 @@
-x >
+'x >'
diff --git a/test/normal/object/end/argument/selections b/test/normal/object/end/argument/selections
index 92020efb..48060a0d 100644
--- a/test/normal/object/end/argument/selections
+++ b/test/normal/object/end/argument/selections
@@ -1 +1 @@
- some,
+' some,'
diff --git a/test/normal/object/end/big-word/selections b/test/normal/object/end/big-word/selections
index d6311946..6a412ffd 100644
--- a/test/normal/object/end/big-word/selections
+++ b/test/normal/object/end/big-word/selections
@@ -1 +1 @@
-bar-baz 
+'bar-baz '
diff --git a/test/normal/object/end/braces/selections b/test/normal/object/end/braces/selections
index 55b26550..f21349b4 100644
--- a/test/normal/object/end/braces/selections
+++ b/test/normal/object/end/braces/selections
@@ -1 +1 @@
-{cmd,in,out}
+'{cmd,in,out}'
diff --git a/test/normal/object/end/brackets/selections b/test/normal/object/end/brackets/selections
index 7d4681a1..1fe6ab87 100644
--- a/test/normal/object/end/brackets/selections
+++ b/test/normal/object/end/brackets/selections
@@ -1 +1 @@
-2,3]
+'2,3]'
diff --git a/test/normal/object/end/double_quote/selections b/test/normal/object/end/double_quote/selections
index d9f07fc6..e0d7da86 100644
--- a/test/normal/object/end/double_quote/selections
+++ b/test/normal/object/end/double_quote/selections
@@ -1 +1 @@
-bar"
+'bar"'
diff --git a/test/normal/object/end/grave_quote/selections b/test/normal/object/end/grave_quote/selections
index b380d541..9c7eb431 100644
--- a/test/normal/object/end/grave_quote/selections
+++ b/test/normal/object/end/grave_quote/selections
@@ -1 +1 @@
-foo`
+'foo`'
diff --git a/test/normal/object/end/indent/selections b/test/normal/object/end/indent/selections
index 9569a91f..95d8e408 100644
--- a/test/normal/object/end/indent/selections
+++ b/test/normal/object/end/indent/selections
@@ -1,3 +1,3 @@
-bar)
-
+'bar)
 
+'
diff --git a/test/normal/object/end/paragraph/selections b/test/normal/object/end/paragraph/selections
index 2887a9d6..e697db0a 100644
--- a/test/normal/object/end/paragraph/selections
+++ b/test/normal/object/end/paragraph/selections
@@ -1,4 +1,4 @@
-c
+'c
 d
 
-
+'
diff --git a/test/normal/object/end/parenthesis/selections b/test/normal/object/end/parenthesis/selections
index 05b3995d..f0da72b7 100644
--- a/test/normal/object/end/parenthesis/selections
+++ b/test/normal/object/end/parenthesis/selections
@@ -1 +1 @@
-bar)
+'bar)'
diff --git a/test/normal/object/end/sentence/selections b/test/normal/object/end/sentence/selections
index 5dd13409..d60bfff4 100644
--- a/test/normal/object/end/sentence/selections
+++ b/test/normal/object/end/sentence/selections
@@ -1,2 +1,2 @@
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor
-incididunt ut labore et dolore magna aliqua.  
+'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor
+incididunt ut labore et dolore magna aliqua.  '
diff --git a/test/normal/object/end/single_quote/selections b/test/normal/object/end/single_quote/selections
index 7ca0922b..6a555c9b 100644
--- a/test/normal/object/end/single_quote/selections
+++ b/test/normal/object/end/single_quote/selections
@@ -1 +1 @@
-bar'
+'bar'''
diff --git a/test/normal/object/end/word/selections b/test/normal/object/end/word/selections
index efe82b7c..563b99d2 100644
--- a/test/normal/object/end/word/selections
+++ b/test/normal/object/end/word/selections
@@ -1 +1 @@
-bar 
+'bar '
diff --git a/test/normal/object/inner/angle/selections b/test/normal/object/inner/angle/selections
index 257cc564..c2c4af01 100644
--- a/test/normal/object/inner/angle/selections
+++ b/test/normal/object/inner/angle/selections
@@ -1 +1 @@
-foo
+'foo'
diff --git a/test/normal/object/inner/argument/multi-level/selections b/test/normal/object/inner/argument/multi-level/selections
index 13942d75..a9216560 100644
--- a/test/normal/object/inner/argument/multi-level/selections
+++ b/test/normal/object/inner/argument/multi-level/selections
@@ -1 +1 @@
-(and some, blub and)
+'(and some, blub and)'
diff --git a/test/normal/object/inner/argument/single-level/selections b/test/normal/object/inner/argument/single-level/selections
index 2137941b..5e7685ae 100644
--- a/test/normal/object/inner/argument/single-level/selections
+++ b/test/normal/object/inner/argument/single-level/selections
@@ -1 +1 @@
-and some
+'and some'
diff --git a/test/normal/object/inner/big-word/selections b/test/normal/object/inner/big-word/selections
index 8965d2e8..678d8c04 100644
--- a/test/normal/object/inner/big-word/selections
+++ b/test/normal/object/inner/big-word/selections
@@ -1 +1 @@
-bar-baz
+'bar-baz'
diff --git a/test/normal/object/inner/braces/selections b/test/normal/object/inner/braces/selections
index e8eefa0c..3a534546 100644
--- a/test/normal/object/inner/braces/selections
+++ b/test/normal/object/inner/braces/selections
@@ -1,3 +1,3 @@
-{
+'{
   "foo"= "bar"
-}
+}'
diff --git a/test/normal/object/inner/brackets/selections b/test/normal/object/inner/brackets/selections
index de140ba3..f5c995b1 100644
--- a/test/normal/object/inner/brackets/selections
+++ b/test/normal/object/inner/brackets/selections
@@ -1,3 +1,3 @@
-[
+'[
   "foo"
-]
+]'
diff --git a/test/normal/object/inner/double_quote/selections b/test/normal/object/inner/double_quote/selections
index 5716ca59..2cde735c 100644
--- a/test/normal/object/inner/double_quote/selections
+++ b/test/normal/object/inner/double_quote/selections
@@ -1 +1 @@
-bar
+'bar'
diff --git a/test/normal/object/inner/grave_quote/selections b/test/normal/object/inner/grave_quote/selections
index 257cc564..c2c4af01 100644
--- a/test/normal/object/inner/grave_quote/selections
+++ b/test/normal/object/inner/grave_quote/selections
@@ -1 +1 @@
-foo
+'foo'
diff --git a/test/normal/object/inner/indent/selections b/test/normal/object/inner/indent/selections
index ffb60196..3237881e 100644
--- a/test/normal/object/inner/indent/selections
+++ b/test/normal/object/inner/indent/selections
@@ -1,2 +1,2 @@
-  foo(bar)
-
+'  foo(bar)
+'
diff --git a/test/normal/object/inner/paragraph/selections b/test/normal/object/inner/paragraph/selections
index 4cdfd2ac..e9b32b31 100644
--- a/test/normal/object/inner/paragraph/selections
+++ b/test/normal/object/inner/paragraph/selections
@@ -1,3 +1,3 @@
-c
+'c
 d
-
+'
diff --git a/test/normal/object/inner/parenthesis/selections b/test/normal/object/inner/parenthesis/selections
index 5716ca59..2cde735c 100644
--- a/test/normal/object/inner/parenthesis/selections
+++ b/test/normal/object/inner/parenthesis/selections
@@ -1 +1 @@
-bar
+'bar'
diff --git a/test/normal/object/inner/sentence/selections b/test/normal/object/inner/sentence/selections
index dd3c7d70..b7a724e2 100644
--- a/test/normal/object/inner/sentence/selections
+++ b/test/normal/object/inner/sentence/selections
@@ -1,2 +1,2 @@
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor
-incididunt ut labore et dolore magna aliqua.
+'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor
+incididunt ut labore et dolore magna aliqua.'
diff --git a/test/normal/object/inner/single_quote/selections b/test/normal/object/inner/single_quote/selections
index 5716ca59..2cde735c 100644
--- a/test/normal/object/inner/single_quote/selections
+++ b/test/normal/object/inner/single_quote/selections
@@ -1 +1 @@
-bar
+'bar'
diff --git a/test/normal/object/inner/slash/selections b/test/normal/object/inner/slash/selections
index 5716ca59..2cde735c 100644
--- a/test/normal/object/inner/slash/selections
+++ b/test/normal/object/inner/slash/selections
@@ -1 +1 @@
-bar
+'bar'
diff --git a/test/normal/object/inner/word/selections b/test/normal/object/inner/word/selections
index 5716ca59..2cde735c 100644
--- a/test/normal/object/inner/word/selections
+++ b/test/normal/object/inner/word/selections
@@ -1 +1 @@
-bar
+'bar'
diff --git a/test/normal/object/on-end/around/angle/selections b/test/normal/object/on-end/around/angle/selections
index 9127b708..05db58e8 100644
--- a/test/normal/object/on-end/around/angle/selections
+++ b/test/normal/object/on-end/around/angle/selections
@@ -1 +1 @@
-<foo>
+'<foo>'
diff --git a/test/normal/object/on-end/around/braces/selections b/test/normal/object/on-end/around/braces/selections
index 56cc1e77..3f3e6a2d 100644
--- a/test/normal/object/on-end/around/braces/selections
+++ b/test/normal/object/on-end/around/braces/selections
@@ -1,3 +1,3 @@
-{
-  "foo"\: "bar"
-}
+'{
+  "foo": "bar"
+}'
diff --git a/test/normal/object/on-end/around/brackets/selections b/test/normal/object/on-end/around/brackets/selections
index de140ba3..f5c995b1 100644
--- a/test/normal/object/on-end/around/brackets/selections
+++ b/test/normal/object/on-end/around/brackets/selections
@@ -1,3 +1,3 @@
-[
+'[
   "foo"
-]
+]'
diff --git a/test/normal/object/on-end/around/parenthesis/selections b/test/normal/object/on-end/around/parenthesis/selections
index c115b234..a12796f9 100644
--- a/test/normal/object/on-end/around/parenthesis/selections
+++ b/test/normal/object/on-end/around/parenthesis/selections
@@ -1 +1 @@
-(bar)
+'(bar)'
diff --git a/test/normal/object/on-end/inner/angle/selections b/test/normal/object/on-end/inner/angle/selections
index 257cc564..c2c4af01 100644
--- a/test/normal/object/on-end/inner/angle/selections
+++ b/test/normal/object/on-end/inner/angle/selections
@@ -1 +1 @@
-foo
+'foo'
diff --git a/test/normal/object/on-end/inner/braces/selections b/test/normal/object/on-end/inner/braces/selections
index e8eefa0c..3a534546 100644
--- a/test/normal/object/on-end/inner/braces/selections
+++ b/test/normal/object/on-end/inner/braces/selections
@@ -1,3 +1,3 @@
-{
+'{
   "foo"= "bar"
-}
+}'
diff --git a/test/normal/object/on-end/inner/brackets/selections b/test/normal/object/on-end/inner/brackets/selections
index de140ba3..f5c995b1 100644
--- a/test/normal/object/on-end/inner/brackets/selections
+++ b/test/normal/object/on-end/inner/brackets/selections
@@ -1,3 +1,3 @@
-[
+'[
   "foo"
-]
+]'
diff --git a/test/normal/object/on-end/inner/parenthesis/selections b/test/normal/object/on-end/inner/parenthesis/selections
index 5716ca59..2cde735c 100644
--- a/test/normal/object/on-end/inner/parenthesis/selections
+++ b/test/normal/object/on-end/inner/parenthesis/selections
@@ -1 +1 @@
-bar
+'bar'
diff --git a/test/normal/object/on-end/to-end/angle/selections b/test/normal/object/on-end/to-end/angle/selections
index 3b3b5e7b..f0fbd821 100644
--- a/test/normal/object/on-end/to-end/angle/selections
+++ b/test/normal/object/on-end/to-end/angle/selections
@@ -1 +1 @@
-> >
+'> >'
diff --git a/test/normal/object/on-end/to-end/braces/selections b/test/normal/object/on-end/to-end/braces/selections
index 1ec35ed3..aabe0115 100644
--- a/test/normal/object/on-end/to-end/braces/selections
+++ b/test/normal/object/on-end/to-end/braces/selections
@@ -1,2 +1,2 @@
-}
-}
+'}
+}'
diff --git a/test/normal/object/on-end/to-end/brackets/selections b/test/normal/object/on-end/to-end/brackets/selections
index fce4f5ed..21fefe02 100644
--- a/test/normal/object/on-end/to-end/brackets/selections
+++ b/test/normal/object/on-end/to-end/brackets/selections
@@ -1,2 +1,2 @@
-]
-]
+']
+]'
diff --git a/test/normal/object/on-end/to-end/parenthesis/selections b/test/normal/object/on-end/to-end/parenthesis/selections
index 9c5df868..46a80682 100644
--- a/test/normal/object/on-end/to-end/parenthesis/selections
+++ b/test/normal/object/on-end/to-end/parenthesis/selections
@@ -1 +1 @@
-))
+'))'
diff --git a/test/normal/object/on-start/around/angle/selections b/test/normal/object/on-start/around/angle/selections
index 9127b708..05db58e8 100644
--- a/test/normal/object/on-start/around/angle/selections
+++ b/test/normal/object/on-start/around/angle/selections
@@ -1 +1 @@
-<foo>
+'<foo>'
diff --git a/test/normal/object/on-start/around/braces/selections b/test/normal/object/on-start/around/braces/selections
index 56cc1e77..3f3e6a2d 100644
--- a/test/normal/object/on-start/around/braces/selections
+++ b/test/normal/object/on-start/around/braces/selections
@@ -1,3 +1,3 @@
-{
-  "foo"\: "bar"
-}
+'{
+  "foo": "bar"
+}'
diff --git a/test/normal/object/on-start/around/brackets/selections b/test/normal/object/on-start/around/brackets/selections
index de140ba3..f5c995b1 100644
--- a/test/normal/object/on-start/around/brackets/selections
+++ b/test/normal/object/on-start/around/brackets/selections
@@ -1,3 +1,3 @@
-[
+'[
   "foo"
-]
+]'
diff --git a/test/normal/object/on-start/around/double_quote/selections b/test/normal/object/on-start/around/double_quote/selections
index 196e5879..e7cafe44 100644
--- a/test/normal/object/on-start/around/double_quote/selections
+++ b/test/normal/object/on-start/around/double_quote/selections
@@ -1 +1 @@
-"bar"
+'"bar"'
diff --git a/test/normal/object/on-start/around/grave_quote/selections b/test/normal/object/on-start/around/grave_quote/selections
index 347253a0..a84a6be9 100644
--- a/test/normal/object/on-start/around/grave_quote/selections
+++ b/test/normal/object/on-start/around/grave_quote/selections
@@ -1 +1 @@
-`foo`
+'`foo`'
diff --git a/test/normal/object/on-start/around/parenthesis/selections b/test/normal/object/on-start/around/parenthesis/selections
index c115b234..a12796f9 100644
--- a/test/normal/object/on-start/around/parenthesis/selections
+++ b/test/normal/object/on-start/around/parenthesis/selections
@@ -1 +1 @@
-(bar)
+'(bar)'
diff --git a/test/normal/object/on-start/around/single_quote/selections b/test/normal/object/on-start/around/single_quote/selections
index 2cde735c..80eca1d8 100644
--- a/test/normal/object/on-start/around/single_quote/selections
+++ b/test/normal/object/on-start/around/single_quote/selections
@@ -1 +1 @@
-'bar'
+'''bar'''
diff --git a/test/normal/object/on-start/around/slash/selections b/test/normal/object/on-start/around/slash/selections
index a5a08411..53f23522 100644
--- a/test/normal/object/on-start/around/slash/selections
+++ b/test/normal/object/on-start/around/slash/selections
@@ -1 +1 @@
-/bar/
+'/bar/'
diff --git a/test/normal/object/on-start/inner/angle/selections b/test/normal/object/on-start/inner/angle/selections
index 257cc564..c2c4af01 100644
--- a/test/normal/object/on-start/inner/angle/selections
+++ b/test/normal/object/on-start/inner/angle/selections
@@ -1 +1 @@
-foo
+'foo'
diff --git a/test/normal/object/on-start/inner/braces/selections b/test/normal/object/on-start/inner/braces/selections
index e8eefa0c..3a534546 100644
--- a/test/normal/object/on-start/inner/braces/selections
+++ b/test/normal/object/on-start/inner/braces/selections
@@ -1,3 +1,3 @@
-{
+'{
   "foo"= "bar"
-}
+}'
diff --git a/test/normal/object/on-start/inner/brackets/selections b/test/normal/object/on-start/inner/brackets/selections
index de140ba3..f5c995b1 100644
--- a/test/normal/object/on-start/inner/brackets/selections
+++ b/test/normal/object/on-start/inner/brackets/selections
@@ -1,3 +1,3 @@
-[
+'[
   "foo"
-]
+]'
diff --git a/test/normal/object/on-start/inner/double_quote/selections b/test/normal/object/on-start/inner/double_quote/selections
index 5716ca59..2cde735c 100644
--- a/test/normal/object/on-start/inner/double_quote/selections
+++ b/test/normal/object/on-start/inner/double_quote/selections
@@ -1 +1 @@
-bar
+'bar'
diff --git a/test/normal/object/on-start/inner/grave_quote/selections b/test/normal/object/on-start/inner/grave_quote/selections
index 257cc564..c2c4af01 100644
--- a/test/normal/object/on-start/inner/grave_quote/selections
+++ b/test/normal/object/on-start/inner/grave_quote/selections
@@ -1 +1 @@
-foo
+'foo'
diff --git a/test/normal/object/on-start/inner/parenthesis/selections b/test/normal/object/on-start/inner/parenthesis/selections
index 5716ca59..2cde735c 100644
--- a/test/normal/object/on-start/inner/parenthesis/selections
+++ b/test/normal/object/on-start/inner/parenthesis/selections
@@ -1 +1 @@
-bar
+'bar'
diff --git a/test/normal/object/on-start/inner/single_quote/selections b/test/normal/object/on-start/inner/single_quote/selections
index 5716ca59..2cde735c 100644
--- a/test/normal/object/on-start/inner/single_quote/selections
+++ b/test/normal/object/on-start/inner/single_quote/selections
@@ -1 +1 @@
-bar
+'bar'
diff --git a/test/normal/object/on-start/to-start/angle/selections b/test/normal/object/on-start/to-start/angle/selections
index 586fb8d0..a145f265 100644
--- a/test/normal/object/on-start/to-start/angle/selections
+++ b/test/normal/object/on-start/to-start/angle/selections
@@ -1 +1 @@
-<foo <
+'<foo <'
diff --git a/test/normal/object/on-start/to-start/braces/selections b/test/normal/object/on-start/to-start/braces/selections
index fb05e26b..6cdaab10 100644
--- a/test/normal/object/on-start/to-start/braces/selections
+++ b/test/normal/object/on-start/to-start/braces/selections
@@ -1,2 +1,2 @@
-{
-  {
+'{
+  {'
diff --git a/test/normal/object/on-start/to-start/brackets/selections b/test/normal/object/on-start/to-start/brackets/selections
index b89de126..87cd9041 100644
--- a/test/normal/object/on-start/to-start/brackets/selections
+++ b/test/normal/object/on-start/to-start/brackets/selections
@@ -1,2 +1,2 @@
-[
-  [
+'[
+  ['
diff --git a/test/normal/object/on-start/to-start/parenthesis/selections b/test/normal/object/on-start/to-start/parenthesis/selections
index 692cf339..ec812f20 100644
--- a/test/normal/object/on-start/to-start/parenthesis/selections
+++ b/test/normal/object/on-start/to-start/parenthesis/selections
@@ -1 +1 @@
-(foo(
+'(foo('
diff --git a/test/normal/object/start-extending/angle/selections b/test/normal/object/start-extending/angle/selections
index 1ab3973e..12624909 100644
--- a/test/normal/object/start-extending/angle/selections
+++ b/test/normal/object/start-extending/angle/selections
@@ -1 +1 @@
-<f
+'<f'
diff --git a/test/normal/object/start-extending/argument/selections b/test/normal/object/start-extending/argument/selections
index 88fbe697..8513ee14 100644
--- a/test/normal/object/start-extending/argument/selections
+++ b/test/normal/object/start-extending/argument/selections
@@ -1 +1 @@
- "somethi
+' "somethi'
diff --git a/test/normal/object/start-extending/big-word/selections b/test/normal/object/start-extending/big-word/selections
index 8965d2e8..678d8c04 100644
--- a/test/normal/object/start-extending/big-word/selections
+++ b/test/normal/object/start-extending/big-word/selections
@@ -1 +1 @@
-bar-baz
+'bar-baz'
diff --git a/test/normal/object/start-extending/braces/selections b/test/normal/object/start-extending/braces/selections
index 5a948a11..7d25af78 100644
--- a/test/normal/object/start-extending/braces/selections
+++ b/test/normal/object/start-extending/braces/selections
@@ -1,2 +1,2 @@
-{
-  "f
+'{
+  "f'
diff --git a/test/normal/object/start-extending/brackets/selections b/test/normal/object/start-extending/brackets/selections
index 126b0c8b..a953cf04 100644
--- a/test/normal/object/start-extending/brackets/selections
+++ b/test/normal/object/start-extending/brackets/selections
@@ -1,2 +1,2 @@
-[
-  "f
+'[
+  "f'
diff --git a/test/normal/object/start-extending/double_quote/selections b/test/normal/object/start-extending/double_quote/selections
index 87e31fb8..8bc8ebc5 100644
--- a/test/normal/object/start-extending/double_quote/selections
+++ b/test/normal/object/start-extending/double_quote/selections
@@ -1 +1 @@
-"b
+'"b'
diff --git a/test/normal/object/start-extending/grave_quote/selections b/test/normal/object/start-extending/grave_quote/selections
index e20e0382..754eb340 100644
--- a/test/normal/object/start-extending/grave_quote/selections
+++ b/test/normal/object/start-extending/grave_quote/selections
@@ -1 +1 @@
-`f
+'`f'
diff --git a/test/normal/object/start-extending/indent/selections b/test/normal/object/start-extending/indent/selections
index 3c7d8873..d1b2e09b 100644
--- a/test/normal/object/start-extending/indent/selections
+++ b/test/normal/object/start-extending/indent/selections
@@ -1,2 +1,2 @@
-
-  foo(b
+'
+  foo(b'
diff --git a/test/normal/object/start-extending/paragraph/selections b/test/normal/object/start-extending/paragraph/selections
index d1d9c6f7..77615f3a 100644
--- a/test/normal/object/start-extending/paragraph/selections
+++ b/test/normal/object/start-extending/paragraph/selections
@@ -1,4 +1,4 @@
-a
+'a
 b
 
-c
+c'
diff --git a/test/normal/object/start-extending/parenthesis/selections b/test/normal/object/start-extending/parenthesis/selections
index a4f1ddd7..4cdfbaee 100644
--- a/test/normal/object/start-extending/parenthesis/selections
+++ b/test/normal/object/start-extending/parenthesis/selections
@@ -1 +1 @@
-(b
+'(b'
diff --git a/test/normal/object/start-extending/sentence/selections b/test/normal/object/start-extending/sentence/selections
index 27e4da30..045096b9 100644
--- a/test/normal/object/start-extending/sentence/selections
+++ b/test/normal/object/start-extending/sentence/selections
@@ -1,2 +1,2 @@
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor
-incididunt ut labore et d
+'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor
+incididunt ut labore et d'
diff --git a/test/normal/object/start-extending/single_quote/selections b/test/normal/object/start-extending/single_quote/selections
index 52d63ab2..0ea867ee 100644
--- a/test/normal/object/start-extending/single_quote/selections
+++ b/test/normal/object/start-extending/single_quote/selections
@@ -1 +1 @@
-'b
+'''b'
diff --git a/test/normal/object/start-extending/word/selections b/test/normal/object/start-extending/word/selections
index 5716ca59..2cde735c 100644
--- a/test/normal/object/start-extending/word/selections
+++ b/test/normal/object/start-extending/word/selections
@@ -1 +1 @@
-bar
+'bar'
diff --git a/test/normal/object/start/angle/selections b/test/normal/object/start/angle/selections
index 1ab3973e..12624909 100644
--- a/test/normal/object/start/angle/selections
+++ b/test/normal/object/start/angle/selections
@@ -1 +1 @@
-<f
+'<f'
diff --git a/test/normal/object/start/argument/selections b/test/normal/object/start/argument/selections
index 16f70569..abd3bf27 100644
--- a/test/normal/object/start/argument/selections
+++ b/test/normal/object/start/argument/selections
@@ -1 +1 @@
-with a pa
+'with a pa'
diff --git a/test/normal/object/start/big-word/selections b/test/normal/object/start/big-word/selections
index 8965d2e8..678d8c04 100644
--- a/test/normal/object/start/big-word/selections
+++ b/test/normal/object/start/big-word/selections
@@ -1 +1 @@
-bar-baz
+'bar-baz'
diff --git a/test/normal/object/start/braces/selections b/test/normal/object/start/braces/selections
index 6e365bec..9bd29faa 100644
--- a/test/normal/object/start/braces/selections
+++ b/test/normal/object/start/braces/selections
@@ -1,2 +1,2 @@
-{
-  "foo
+'{
+  "foo'
diff --git a/test/normal/object/start/brackets/selections b/test/normal/object/start/brackets/selections
index a42eb4eb..63f4c446 100644
--- a/test/normal/object/start/brackets/selections
+++ b/test/normal/object/start/brackets/selections
@@ -1,2 +1,2 @@
-[
-  "foo
+'[
+  "foo'
diff --git a/test/normal/object/start/double_quote/selections b/test/normal/object/start/double_quote/selections
index 87e31fb8..8bc8ebc5 100644
--- a/test/normal/object/start/double_quote/selections
+++ b/test/normal/object/start/double_quote/selections
@@ -1 +1 @@
-"b
+'"b'
diff --git a/test/normal/object/start/grave_quote/selections b/test/normal/object/start/grave_quote/selections
index e20e0382..754eb340 100644
--- a/test/normal/object/start/grave_quote/selections
+++ b/test/normal/object/start/grave_quote/selections
@@ -1 +1 @@
-`f
+'`f'
diff --git a/test/normal/object/start/indent/selections b/test/normal/object/start/indent/selections
index 3c7d8873..d1b2e09b 100644
--- a/test/normal/object/start/indent/selections
+++ b/test/normal/object/start/indent/selections
@@ -1,2 +1,2 @@
-
-  foo(b
+'
+  foo(b'
diff --git a/test/normal/object/start/paragraph/selections b/test/normal/object/start/paragraph/selections
index 3a41e248..89118bfc 100644
--- a/test/normal/object/start/paragraph/selections
+++ b/test/normal/object/start/paragraph/selections
@@ -1,4 +1,4 @@
-a
+'a
 b
 
-
+'
diff --git a/test/normal/object/start/parenthesis/selections b/test/normal/object/start/parenthesis/selections
index a4f1ddd7..4cdfbaee 100644
--- a/test/normal/object/start/parenthesis/selections
+++ b/test/normal/object/start/parenthesis/selections
@@ -1 +1 @@
-(b
+'(b'
diff --git a/test/normal/object/start/sentence/selections b/test/normal/object/start/sentence/selections
index 837b6bb4..7e0d5030 100644
--- a/test/normal/object/start/sentence/selections
+++ b/test/normal/object/start/sentence/selections
@@ -1,2 +1,2 @@
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor
-incididunt ut labore et dolore magna aliqua
+'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor
+incididunt ut labore et dolore magna aliqua'
diff --git a/test/normal/object/start/single_quote/selections b/test/normal/object/start/single_quote/selections
index 52d63ab2..0ea867ee 100644
--- a/test/normal/object/start/single_quote/selections
+++ b/test/normal/object/start/single_quote/selections
@@ -1 +1 @@
-'b
+'''b'
diff --git a/test/normal/object/start/word/selections b/test/normal/object/start/word/selections
index 5716ca59..2cde735c 100644
--- a/test/normal/object/start/word/selections
+++ b/test/normal/object/start/word/selections
@@ -1 +1 @@
-bar
+'bar'
diff --git a/test/normal/previous-big-word-extending/selections b/test/normal/previous-big-word-extending/selections
index 20b4d26d..9f718fc9 100644
--- a/test/normal/previous-big-word-extending/selections
+++ b/test/normal/previous-big-word-extending/selections
@@ -1 +1 @@
-foo b
+'foo b'
diff --git a/test/normal/previous-big-word/selections b/test/normal/previous-big-word/selections
index 20b4d26d..9f718fc9 100644
--- a/test/normal/previous-big-word/selections
+++ b/test/normal/previous-big-word/selections
@@ -1 +1 @@
-foo b
+'foo b'
diff --git a/test/normal/previous-word-extending/selections b/test/normal/previous-word-extending/selections
index 564d4dda..576e9657 100644
--- a/test/normal/previous-word-extending/selections
+++ b/test/normal/previous-word-extending/selections
@@ -1 +1 @@
-foo 
+'foo '
diff --git a/test/normal/previous-word/selections b/test/normal/previous-word/selections
index 564d4dda..576e9657 100644
--- a/test/normal/previous-word/selections
+++ b/test/normal/previous-word/selections
@@ -1 +1 @@
-foo 
+'foo '
diff --git a/test/normal/rotate/selections b/test/normal/rotate/selections
index ce22f89b..51a42bce 100644
--- a/test/normal/rotate/selections
+++ b/test/normal/rotate/selections
@@ -1 +1 @@
-bar:baz
+'bar' 'baz'
diff --git a/test/normal/save-selections/selections b/test/normal/save-selections/selections
index 6949e3af..219d1ed2 100644
--- a/test/normal/save-selections/selections
+++ b/test/normal/save-selections/selections
@@ -1 +1 @@
-multiple lines
+'multiple lines'
diff --git a/test/normal/search-extending/selections b/test/normal/search-extending/selections
index 1da92a26..6d3a5b42 100644
--- a/test/normal/search-extending/selections
+++ b/test/normal/search-extending/selections
@@ -1 +1 @@
-bar baz
+'bar baz'
diff --git a/test/normal/search-reverse-extending/selections b/test/normal/search-reverse-extending/selections
index 20b4d26d..9f718fc9 100644
--- a/test/normal/search-reverse-extending/selections
+++ b/test/normal/search-reverse-extending/selections
@@ -1 +1 @@
-foo b
+'foo b'
diff --git a/test/normal/search-reverse-rightmost/missed-match/selections b/test/normal/search-reverse-rightmost/missed-match/selections
index 0e46b314..a6c20896 100644
--- a/test/normal/search-reverse-rightmost/missed-match/selections
+++ b/test/normal/search-reverse-rightmost/missed-match/selections
@@ -1 +1 @@
-baba
+'baba'
diff --git a/test/normal/search-reverse-rightmost/overlap/selections b/test/normal/search-reverse-rightmost/overlap/selections
index 1505b408..b6fa64fb 100644
--- a/test/normal/search-reverse-rightmost/overlap/selections
+++ b/test/normal/search-reverse-rightmost/overlap/selections
@@ -1 +1 @@
-efg
+'efg'
diff --git a/test/normal/search-reverse/selections b/test/normal/search-reverse/selections
index 257cc564..c2c4af01 100644
--- a/test/normal/search-reverse/selections
+++ b/test/normal/search-reverse/selections
@@ -1 +1 @@
-foo
+'foo'
diff --git a/test/normal/search/selections b/test/normal/search/selections
index 76018072..0382990e 100644
--- a/test/normal/search/selections
+++ b/test/normal/search/selections
@@ -1 +1 @@
-baz
+'baz'
diff --git a/test/normal/select-line-extending/selections b/test/normal/select-line-extending/selections
index 75d7bfb8..97a30d3c 100644
--- a/test/normal/select-line-extending/selections
+++ b/test/normal/select-line-extending/selections
@@ -1,2 +1,2 @@
-foo
-
+'foo
+'
diff --git a/test/normal/select-line/selections b/test/normal/select-line/selections
index 75d7bfb8..97a30d3c 100644
--- a/test/normal/select-line/selections
+++ b/test/normal/select-line/selections
@@ -1,2 +1,2 @@
-foo
-
+'foo
+'
diff --git a/test/normal/select/selections b/test/normal/select/selections
index 257cc564..c2c4af01 100644
--- a/test/normal/select/selections
+++ b/test/normal/select/selections
@@ -1 +1 @@
-foo
+'foo'
diff --git a/test/normal/split-at-begin/selections b/test/normal/split-at-begin/selections
index dd81dec5..33c287a9 100644
--- a/test/normal/split-at-begin/selections
+++ b/test/normal/split-at-begin/selections
@@ -1,2 +1,2 @@
- : :
-
+' ' ' ' '
+'
diff --git a/test/normal/split-multiple-lines/selections b/test/normal/split-multiple-lines/selections
index 4df657f3..4bae7327 100644
--- a/test/normal/split-multiple-lines/selections
+++ b/test/normal/split-multiple-lines/selections
@@ -1,6 +1,6 @@
-line 1
+'line 1
 line 2
-:line 3
+' 'line 3
 line 4
-:line 5
-
+' 'line 5
+'
diff --git a/test/normal/split/selections b/test/normal/split/selections
index 49f37f3d..45d79f3b 100644
--- a/test/normal/split/selections
+++ b/test/normal/split/selections
@@ -1 +1 @@
-foo:bar:baz
+'foo' 'bar' 'baz'
diff --git a/test/normal/switch-case/selections b/test/normal/switch-case/selections
index 9558898b..a49d02bc 100644
--- a/test/normal/switch-case/selections
+++ b/test/normal/switch-case/selections
@@ -1 +1 @@
-FOO bar
+'FOO bar'
diff --git a/test/normal/to-char-backward-extending/selections b/test/normal/to-char-backward-extending/selections
index 8e85b581..84caf089 100644
--- a/test/normal/to-char-backward-extending/selections
+++ b/test/normal/to-char-backward-extending/selections
@@ -1 +1 @@
-|b
+'|b'
diff --git a/test/normal/to-char-backward/selections b/test/normal/to-char-backward/selections
index cecd2dec..118347bb 100644
--- a/test/normal/to-char-backward/selections
+++ b/test/normal/to-char-backward/selections
@@ -1 +1 @@
-|bar
+'|bar'
diff --git a/test/normal/to-char-forward-extending/selections b/test/normal/to-char-forward-extending/selections
index b9f1b3f0..7bdb3541 100644
--- a/test/normal/to-char-forward-extending/selections
+++ b/test/normal/to-char-forward-extending/selections
@@ -1 +1 @@
-bar|
+'bar|'
diff --git a/test/normal/to-char-forward/selections b/test/normal/to-char-forward/selections
index 46e2eef4..6c9923ad 100644
--- a/test/normal/to-char-forward/selections
+++ b/test/normal/to-char-forward/selections
@@ -1 +1 @@
-r|
+'r|'
diff --git a/test/normal/trim-lines/selections b/test/normal/trim-lines/selections
index 23361fb5..0e43a8c3 100644
--- a/test/normal/trim-lines/selections
+++ b/test/normal/trim-lines/selections
@@ -1,2 +1,2 @@
-two lines
-
+'two lines
+'
diff --git a/test/normal/trim/table/selections b/test/normal/trim/table/selections
index ed988a11..dcc44548 100644
--- a/test/normal/trim/table/selections
+++ b/test/normal/trim/table/selections
@@ -1 +1 @@
-foo:bar:qux:pop:hip:kakoune
+'foo' 'bar' 'qux' 'pop' 'hip' 'kakoune'
diff --git a/test/normal/upper-case/selections b/test/normal/upper-case/selections
index b7d6715e..b7e5a022 100644
--- a/test/normal/upper-case/selections
+++ b/test/normal/upper-case/selections
@@ -1 +1 @@
-FOO
+'FOO'
diff --git a/test/regression/0-assert-on-itersel/selections b/test/regression/0-assert-on-itersel/selections
index c0b5ef40..417f266f 100644
--- a/test/regression/0-assert-on-itersel/selections
+++ b/test/regression/0-assert-on-itersel/selections
@@ -1 +1 @@
-l:3
+'l' '3'
diff --git a/test/regression/1014-ambiguous-kak_selections/selections b/test/regression/1014-ambiguous-kak_selections/selections
index 16016faf..93ee0780 100644
--- a/test/regression/1014-ambiguous-kak_selections/selections
+++ b/test/regression/1014-ambiguous-kak_selections/selections
@@ -1 +1 @@
-foo\\\:bar:foo\\\\:bar
+'foo\:bar' 'foo\\' 'bar'
diff --git a/test/regression/1105-object-selection-behaviour/selections b/test/regression/1105-object-selection-behaviour/selections
index f761ec19..dcb58ec6 100644
--- a/test/regression/1105-object-selection-behaviour/selections
+++ b/test/regression/1105-object-selection-behaviour/selections
@@ -1 +1 @@
-bbb
+'bbb'
diff --git a/test/regression/1233-corrent-cursor-handling-for-indent-objects/selections b/test/regression/1233-corrent-cursor-handling-for-indent-objects/selections
index af9714bb..6cdc0cd8 100644
--- a/test/regression/1233-corrent-cursor-handling-for-indent-objects/selections
+++ b/test/regression/1233-corrent-cursor-handling-for-indent-objects/selections
@@ -1,3 +1,3 @@
-bar
+'bar
     baz
-
+'
diff --git a/test/regression/1308-wrong-behaviour-of-kak-indent-on-newline/selections b/test/regression/1308-wrong-behaviour-of-kak-indent-on-newline/selections
index 139597f9..1b0a989d 100644
--- a/test/regression/1308-wrong-behaviour-of-kak-indent-on-newline/selections
+++ b/test/regression/1308-wrong-behaviour-of-kak-indent-on-newline/selections
@@ -1,2 +1,2 @@
-
-
+'
+'
diff --git a/test/regression/1904-select-empty-line-indent-gets-whole-buffer/selections b/test/regression/1904-select-empty-line-indent-gets-whole-buffer/selections
index 90241a37..bd76e61b 100644
--- a/test/regression/1904-select-empty-line-indent-gets-whole-buffer/selections
+++ b/test/regression/1904-select-empty-line-indent-gets-whole-buffer/selections
@@ -1,4 +1,4 @@
-    foo
+'    foo
 
     bar
-
+'
diff --git a/test/regression/2030-custom-selection-nesting/selections b/test/regression/2030-custom-selection-nesting/selections
index 176daf9a..98eb6025 100644
--- a/test/regression/2030-custom-selection-nesting/selections
+++ b/test/regression/2030-custom-selection-nesting/selections
@@ -1 +1 @@
-aa aa bb cc cc
+'aa aa bb cc cc'
diff --git a/test/regression/751-wrong-selection-after-undo/selections b/test/regression/751-wrong-selection-after-undo/selections
index da9a2398..3dd1f792 100644
--- a/test/regression/751-wrong-selection-after-undo/selections
+++ b/test/regression/751-wrong-selection-after-undo/selections
@@ -1,3 +1,3 @@
-{
-:, :
-}
+'{
+' ', ' '
+}'
diff --git a/test/regression/809-alt-f-t-to-first-char/selections b/test/regression/809-alt-f-t-to-first-char/selections
index 323fae03..149b4df1 100644
--- a/test/regression/809-alt-f-t-to-first-char/selections
+++ b/test/regression/809-alt-f-t-to-first-char/selections
@@ -1 +1 @@
-foobar
+'foobar'
diff --git a/test/regression/811-double-width-codepoints/selections b/test/regression/811-double-width-codepoints/selections
index 336acf4a..1996bfde 100644
--- a/test/regression/811-double-width-codepoints/selections
+++ b/test/regression/811-double-width-codepoints/selections
@@ -1 +1 @@
-三:四
+'三' '四'
diff --git a/test/regression/844-prev-word-at-buffer-start/selections b/test/regression/844-prev-word-at-buffer-start/selections
index 1a4baf53..84223614 100644
--- a/test/regression/844-prev-word-at-buffer-start/selections
+++ b/test/regression/844-prev-word-at-buffer-start/selections
@@ -1 +1 @@
-  
+'  '
diff --git a/test/regression/921-keep-empty-line-matches-all-lines/selections b/test/regression/921-keep-empty-line-matches-all-lines/selections
index 139597f9..1b0a989d 100644
--- a/test/regression/921-keep-empty-line-matches-all-lines/selections
+++ b/test/regression/921-keep-empty-line-matches-all-lines/selections
@@ -1,2 +1,2 @@
-
-
+'
+'