diff --git a/test/unit/align-tab/cmd b/test/normal/align-tab/cmd
similarity index 100%
rename from test/unit/align-tab/cmd
rename to test/normal/align-tab/cmd
diff --git a/test/unit/align-tab/in b/test/normal/align-tab/in
similarity index 100%
rename from test/unit/align-tab/in
rename to test/normal/align-tab/in
diff --git a/test/unit/align-tab/out b/test/normal/align-tab/out
similarity index 100%
rename from test/unit/align-tab/out
rename to test/normal/align-tab/out
diff --git a/test/unit/align-tab/rc b/test/normal/align-tab/rc
similarity index 100%
rename from test/unit/align-tab/rc
rename to test/normal/align-tab/rc
diff --git a/test/unit/align/cmd b/test/normal/align/cmd
similarity index 100%
rename from test/unit/align/cmd
rename to test/normal/align/cmd
diff --git a/test/unit/align/in b/test/normal/align/in
similarity index 100%
rename from test/unit/align/in
rename to test/normal/align/in
diff --git a/test/unit/align/out b/test/normal/align/out
similarity index 100%
rename from test/unit/align/out
rename to test/normal/align/out
diff --git a/test/unit/all/cmd b/test/normal/all/cmd
similarity index 100%
rename from test/unit/all/cmd
rename to test/normal/all/cmd
diff --git a/test/unit/all/in b/test/normal/all/in
similarity index 100%
rename from test/unit/all/in
rename to test/normal/all/in
diff --git a/test/unit/all/selections b/test/normal/all/selections
similarity index 100%
rename from test/unit/all/selections
rename to test/normal/all/selections
diff --git a/test/unit/append-at-eol/cmd b/test/normal/append-at-eol/cmd
similarity index 100%
rename from test/unit/append-at-eol/cmd
rename to test/normal/append-at-eol/cmd
diff --git a/test/unit/append-at-eol/in b/test/normal/append-at-eol/in
similarity index 100%
rename from test/unit/append-at-eol/in
rename to test/normal/append-at-eol/in
diff --git a/test/unit/append-at-eol/out b/test/normal/append-at-eol/out
similarity index 100%
rename from test/unit/append-at-eol/out
rename to test/normal/append-at-eol/out
diff --git a/test/unit/append/cmd b/test/normal/append/cmd
similarity index 100%
rename from test/unit/append/cmd
rename to test/normal/append/cmd
diff --git a/test/unit/append/in b/test/normal/append/in
similarity index 100%
rename from test/unit/append/in
rename to test/normal/append/in
diff --git a/test/unit/append/selections b/test/normal/append/selections
similarity index 100%
rename from test/unit/append/selections
rename to test/normal/append/selections
diff --git a/test/unit/change/cmd b/test/normal/change/cmd
similarity index 100%
rename from test/unit/change/cmd
rename to test/normal/change/cmd
diff --git a/test/unit/change/in b/test/normal/change/in
similarity index 100%
rename from test/unit/change/in
rename to test/normal/change/in
diff --git a/test/unit/change/out b/test/normal/change/out
similarity index 100%
rename from test/unit/change/out
rename to test/normal/change/out
diff --git a/test/unit/clear-selections/cmd b/test/normal/clear-selections/cmd
similarity index 100%
rename from test/unit/clear-selections/cmd
rename to test/normal/clear-selections/cmd
diff --git a/test/unit/clear-selections/in b/test/normal/clear-selections/in
similarity index 100%
rename from test/unit/clear-selections/in
rename to test/normal/clear-selections/in
diff --git a/test/unit/clear-selections/selections b/test/normal/clear-selections/selections
similarity index 100%
rename from test/unit/clear-selections/selections
rename to test/normal/clear-selections/selections
diff --git a/test/unit/codepoint-width/tab-width/cmd b/test/normal/codepoint-width/tab-width/cmd
similarity index 100%
rename from test/unit/codepoint-width/tab-width/cmd
rename to test/normal/codepoint-width/tab-width/cmd
diff --git a/test/unit/codepoint-width/tab-width/enabled b/test/normal/codepoint-width/tab-width/enabled
similarity index 100%
rename from test/unit/codepoint-width/tab-width/enabled
rename to test/normal/codepoint-width/tab-width/enabled
diff --git a/test/unit/codepoint-width/tab-width/in b/test/normal/codepoint-width/tab-width/in
similarity index 100%
rename from test/unit/codepoint-width/tab-width/in
rename to test/normal/codepoint-width/tab-width/in
diff --git a/test/unit/codepoint-width/tab-width/selections b/test/normal/codepoint-width/tab-width/selections
similarity index 100%
rename from test/unit/codepoint-width/tab-width/selections
rename to test/normal/codepoint-width/tab-width/selections
diff --git a/test/unit/codepoint-width/vertical-movement/cmd b/test/normal/codepoint-width/vertical-movement/cmd
similarity index 100%
rename from test/unit/codepoint-width/vertical-movement/cmd
rename to test/normal/codepoint-width/vertical-movement/cmd
diff --git a/test/unit/codepoint-width/vertical-movement/enabled b/test/normal/codepoint-width/vertical-movement/enabled
similarity index 100%
rename from test/unit/codepoint-width/vertical-movement/enabled
rename to test/normal/codepoint-width/vertical-movement/enabled
diff --git a/test/unit/codepoint-width/vertical-movement/in b/test/normal/codepoint-width/vertical-movement/in
similarity index 100%
rename from test/unit/codepoint-width/vertical-movement/in
rename to test/normal/codepoint-width/vertical-movement/in
diff --git a/test/unit/codepoint-width/vertical-movement/selections b/test/normal/codepoint-width/vertical-movement/selections
similarity index 100%
rename from test/unit/codepoint-width/vertical-movement/selections
rename to test/normal/codepoint-width/vertical-movement/selections
diff --git a/test/unit/concat-paste-line/cmd b/test/normal/concat-paste-line/cmd
similarity index 100%
rename from test/unit/concat-paste-line/cmd
rename to test/normal/concat-paste-line/cmd
diff --git a/test/unit/concat-paste-line/in b/test/normal/concat-paste-line/in
similarity index 100%
rename from test/unit/concat-paste-line/in
rename to test/normal/concat-paste-line/in
diff --git a/test/unit/concat-paste-line/out b/test/normal/concat-paste-line/out
similarity index 100%
rename from test/unit/concat-paste-line/out
rename to test/normal/concat-paste-line/out
diff --git a/test/unit/concat-paste-line/state b/test/normal/concat-paste-line/state
similarity index 100%
rename from test/unit/concat-paste-line/state
rename to test/normal/concat-paste-line/state
diff --git a/test/unit/concat-paste/cmd b/test/normal/concat-paste/cmd
similarity index 100%
rename from test/unit/concat-paste/cmd
rename to test/normal/concat-paste/cmd
diff --git a/test/unit/concat-paste/in b/test/normal/concat-paste/in
similarity index 100%
rename from test/unit/concat-paste/in
rename to test/normal/concat-paste/in
diff --git a/test/unit/concat-paste/out b/test/normal/concat-paste/out
similarity index 100%
rename from test/unit/concat-paste/out
rename to test/normal/concat-paste/out
diff --git a/test/unit/convert-spaces-to-tabs/cmd b/test/normal/convert-spaces-to-tabs/cmd
similarity index 100%
rename from test/unit/convert-spaces-to-tabs/cmd
rename to test/normal/convert-spaces-to-tabs/cmd
diff --git a/test/unit/convert-spaces-to-tabs/in b/test/normal/convert-spaces-to-tabs/in
similarity index 100%
rename from test/unit/convert-spaces-to-tabs/in
rename to test/normal/convert-spaces-to-tabs/in
diff --git a/test/unit/convert-spaces-to-tabs/out b/test/normal/convert-spaces-to-tabs/out
similarity index 100%
rename from test/unit/convert-spaces-to-tabs/out
rename to test/normal/convert-spaces-to-tabs/out
diff --git a/test/unit/convert-tabs-to-spaces/cmd b/test/normal/convert-tabs-to-spaces/cmd
similarity index 100%
rename from test/unit/convert-tabs-to-spaces/cmd
rename to test/normal/convert-tabs-to-spaces/cmd
diff --git a/test/unit/convert-tabs-to-spaces/in b/test/normal/convert-tabs-to-spaces/in
similarity index 100%
rename from test/unit/convert-tabs-to-spaces/in
rename to test/normal/convert-tabs-to-spaces/in
diff --git a/test/unit/convert-tabs-to-spaces/out b/test/normal/convert-tabs-to-spaces/out
similarity index 100%
rename from test/unit/convert-tabs-to-spaces/out
rename to test/normal/convert-tabs-to-spaces/out
diff --git a/test/unit/deindent/cmd b/test/normal/deindent/cmd
similarity index 100%
rename from test/unit/deindent/cmd
rename to test/normal/deindent/cmd
diff --git a/test/unit/deindent/in b/test/normal/deindent/in
similarity index 100%
rename from test/unit/deindent/in
rename to test/normal/deindent/in
diff --git a/test/unit/deindent/out b/test/normal/deindent/out
similarity index 100%
rename from test/unit/deindent/out
rename to test/normal/deindent/out
diff --git a/test/unit/delete/cmd b/test/normal/delete/cmd
similarity index 100%
rename from test/unit/delete/cmd
rename to test/normal/delete/cmd
diff --git a/test/unit/delete/in b/test/normal/delete/in
similarity index 100%
rename from test/unit/delete/in
rename to test/normal/delete/in
diff --git a/test/unit/delete/out b/test/normal/delete/out
similarity index 100%
rename from test/unit/delete/out
rename to test/normal/delete/out
diff --git a/test/unit/extend-lines/cmd b/test/normal/extend-lines/cmd
similarity index 100%
rename from test/unit/extend-lines/cmd
rename to test/normal/extend-lines/cmd
diff --git a/test/unit/extend-lines/in b/test/normal/extend-lines/in
similarity index 100%
rename from test/unit/extend-lines/in
rename to test/normal/extend-lines/in
diff --git a/test/unit/extend-lines/selections b/test/normal/extend-lines/selections
similarity index 100%
rename from test/unit/extend-lines/selections
rename to test/normal/extend-lines/selections
diff --git a/test/unit/facedesc-invalid-syntax/attributes/cmd b/test/normal/facedesc-invalid-syntax/attributes/cmd
similarity index 100%
rename from test/unit/facedesc-invalid-syntax/attributes/cmd
rename to test/normal/facedesc-invalid-syntax/attributes/cmd
diff --git a/test/unit/facedesc-invalid-syntax/attributes/error b/test/normal/facedesc-invalid-syntax/attributes/error
similarity index 100%
rename from test/unit/facedesc-invalid-syntax/attributes/error
rename to test/normal/facedesc-invalid-syntax/attributes/error
diff --git a/test/unit/facedesc-invalid-syntax/bg-color/cmd b/test/normal/facedesc-invalid-syntax/bg-color/cmd
similarity index 100%
rename from test/unit/facedesc-invalid-syntax/bg-color/cmd
rename to test/normal/facedesc-invalid-syntax/bg-color/cmd
diff --git a/test/unit/facedesc-invalid-syntax/bg-color/error b/test/normal/facedesc-invalid-syntax/bg-color/error
similarity index 100%
rename from test/unit/facedesc-invalid-syntax/bg-color/error
rename to test/normal/facedesc-invalid-syntax/bg-color/error
diff --git a/test/unit/find-char-backward-extending/cmd b/test/normal/find-char-backward-extending/cmd
similarity index 100%
rename from test/unit/find-char-backward-extending/cmd
rename to test/normal/find-char-backward-extending/cmd
diff --git a/test/unit/find-char-backward-extending/in b/test/normal/find-char-backward-extending/in
similarity index 100%
rename from test/unit/find-char-backward-extending/in
rename to test/normal/find-char-backward-extending/in
diff --git a/test/unit/find-char-backward-extending/selections b/test/normal/find-char-backward-extending/selections
similarity index 100%
rename from test/unit/find-char-backward-extending/selections
rename to test/normal/find-char-backward-extending/selections
diff --git a/test/unit/find-char-backward/cmd b/test/normal/find-char-backward/cmd
similarity index 100%
rename from test/unit/find-char-backward/cmd
rename to test/normal/find-char-backward/cmd
diff --git a/test/unit/find-char-backward/in b/test/normal/find-char-backward/in
similarity index 100%
rename from test/unit/find-char-backward/in
rename to test/normal/find-char-backward/in
diff --git a/test/unit/find-char-backward/selections b/test/normal/find-char-backward/selections
similarity index 100%
rename from test/unit/find-char-backward/selections
rename to test/normal/find-char-backward/selections
diff --git a/test/unit/find-char-forward-extending/cmd b/test/normal/find-char-forward-extending/cmd
similarity index 100%
rename from test/unit/find-char-forward-extending/cmd
rename to test/normal/find-char-forward-extending/cmd
diff --git a/test/unit/find-char-forward-extending/in b/test/normal/find-char-forward-extending/in
similarity index 100%
rename from test/unit/find-char-forward-extending/in
rename to test/normal/find-char-forward-extending/in
diff --git a/test/unit/find-char-forward-extending/selections b/test/normal/find-char-forward-extending/selections
similarity index 100%
rename from test/unit/find-char-forward-extending/selections
rename to test/normal/find-char-forward-extending/selections
diff --git a/test/unit/find-char-forward/cmd b/test/normal/find-char-forward/cmd
similarity index 100%
rename from test/unit/find-char-forward/cmd
rename to test/normal/find-char-forward/cmd
diff --git a/test/unit/find-char-forward/in b/test/normal/find-char-forward/in
similarity index 100%
rename from test/unit/find-char-forward/in
rename to test/normal/find-char-forward/in
diff --git a/test/unit/find-char-forward/selections b/test/normal/find-char-forward/selections
similarity index 100%
rename from test/unit/find-char-forward/selections
rename to test/normal/find-char-forward/selections
diff --git a/test/unit/goto-extending/buffer-bottom/cmd b/test/normal/goto-extending/buffer-bottom/cmd
similarity index 100%
rename from test/unit/goto-extending/buffer-bottom/cmd
rename to test/normal/goto-extending/buffer-bottom/cmd
diff --git a/test/unit/goto-extending/buffer-bottom/in b/test/normal/goto-extending/buffer-bottom/in
similarity index 100%
rename from test/unit/goto-extending/buffer-bottom/in
rename to test/normal/goto-extending/buffer-bottom/in
diff --git a/test/unit/goto-extending/buffer-bottom/selections b/test/normal/goto-extending/buffer-bottom/selections
similarity index 100%
rename from test/unit/goto-extending/buffer-bottom/selections
rename to test/normal/goto-extending/buffer-bottom/selections
diff --git a/test/unit/goto-extending/buffer-end/cmd b/test/normal/goto-extending/buffer-end/cmd
similarity index 100%
rename from test/unit/goto-extending/buffer-end/cmd
rename to test/normal/goto-extending/buffer-end/cmd
diff --git a/test/unit/goto-extending/buffer-end/in b/test/normal/goto-extending/buffer-end/in
similarity index 100%
rename from test/unit/goto-extending/buffer-end/in
rename to test/normal/goto-extending/buffer-end/in
diff --git a/test/unit/goto-extending/buffer-end/selections b/test/normal/goto-extending/buffer-end/selections
similarity index 100%
rename from test/unit/goto-extending/buffer-end/selections
rename to test/normal/goto-extending/buffer-end/selections
diff --git a/test/unit/goto-extending/buffer-top/cmd b/test/normal/goto-extending/buffer-top/cmd
similarity index 100%
rename from test/unit/goto-extending/buffer-top/cmd
rename to test/normal/goto-extending/buffer-top/cmd
diff --git a/test/unit/goto-extending/buffer-top/in b/test/normal/goto-extending/buffer-top/in
similarity index 100%
rename from test/unit/goto-extending/buffer-top/in
rename to test/normal/goto-extending/buffer-top/in
diff --git a/test/unit/goto-extending/buffer-top/selections b/test/normal/goto-extending/buffer-top/selections
similarity index 100%
rename from test/unit/goto-extending/buffer-top/selections
rename to test/normal/goto-extending/buffer-top/selections
diff --git a/test/unit/goto-extending/last-change/cmd b/test/normal/goto-extending/last-change/cmd
similarity index 100%
rename from test/unit/goto-extending/last-change/cmd
rename to test/normal/goto-extending/last-change/cmd
diff --git a/test/unit/goto-extending/last-change/in b/test/normal/goto-extending/last-change/in
similarity index 100%
rename from test/unit/goto-extending/last-change/in
rename to test/normal/goto-extending/last-change/in
diff --git a/test/unit/goto-extending/last-change/selections b/test/normal/goto-extending/last-change/selections
similarity index 100%
rename from test/unit/goto-extending/last-change/selections
rename to test/normal/goto-extending/last-change/selections
diff --git a/test/unit/goto-extending/line-begin/cmd b/test/normal/goto-extending/line-begin/cmd
similarity index 100%
rename from test/unit/goto-extending/line-begin/cmd
rename to test/normal/goto-extending/line-begin/cmd
diff --git a/test/unit/goto-extending/line-begin/in b/test/normal/goto-extending/line-begin/in
similarity index 100%
rename from test/unit/goto-extending/line-begin/in
rename to test/normal/goto-extending/line-begin/in
diff --git a/test/unit/goto-extending/line-begin/selections b/test/normal/goto-extending/line-begin/selections
similarity index 100%
rename from test/unit/goto-extending/line-begin/selections
rename to test/normal/goto-extending/line-begin/selections
diff --git a/test/unit/goto-extending/line-end/cmd b/test/normal/goto-extending/line-end/cmd
similarity index 100%
rename from test/unit/goto-extending/line-end/cmd
rename to test/normal/goto-extending/line-end/cmd
diff --git a/test/unit/goto-extending/line-end/in b/test/normal/goto-extending/line-end/in
similarity index 100%
rename from test/unit/goto-extending/line-end/in
rename to test/normal/goto-extending/line-end/in
diff --git a/test/unit/goto-extending/line-end/selections b/test/normal/goto-extending/line-end/selections
similarity index 100%
rename from test/unit/goto-extending/line-end/selections
rename to test/normal/goto-extending/line-end/selections
diff --git a/test/unit/goto/buffer-bottom/cmd b/test/normal/goto/buffer-bottom/cmd
similarity index 100%
rename from test/unit/goto/buffer-bottom/cmd
rename to test/normal/goto/buffer-bottom/cmd
diff --git a/test/unit/goto/buffer-bottom/in b/test/normal/goto/buffer-bottom/in
similarity index 100%
rename from test/unit/goto/buffer-bottom/in
rename to test/normal/goto/buffer-bottom/in
diff --git a/test/unit/goto/buffer-bottom/selections b/test/normal/goto/buffer-bottom/selections
similarity index 100%
rename from test/unit/goto/buffer-bottom/selections
rename to test/normal/goto/buffer-bottom/selections
diff --git a/test/unit/goto/buffer-end/cmd b/test/normal/goto/buffer-end/cmd
similarity index 100%
rename from test/unit/goto/buffer-end/cmd
rename to test/normal/goto/buffer-end/cmd
diff --git a/test/unit/goto/buffer-end/in b/test/normal/goto/buffer-end/in
similarity index 100%
rename from test/unit/goto/buffer-end/in
rename to test/normal/goto/buffer-end/in
diff --git a/test/unit/goto/buffer-end/selections b/test/normal/goto/buffer-end/selections
similarity index 100%
rename from test/unit/goto/buffer-end/selections
rename to test/normal/goto/buffer-end/selections
diff --git a/test/unit/goto/buffer-top/cmd b/test/normal/goto/buffer-top/cmd
similarity index 100%
rename from test/unit/goto/buffer-top/cmd
rename to test/normal/goto/buffer-top/cmd
diff --git a/test/unit/goto/buffer-top/in b/test/normal/goto/buffer-top/in
similarity index 100%
rename from test/unit/goto/buffer-top/in
rename to test/normal/goto/buffer-top/in
diff --git a/test/unit/goto/buffer-top/selections b/test/normal/goto/buffer-top/selections
similarity index 100%
rename from test/unit/goto/buffer-top/selections
rename to test/normal/goto/buffer-top/selections
diff --git a/test/unit/goto/file/cmd b/test/normal/goto/file/cmd
similarity index 100%
rename from test/unit/goto/file/cmd
rename to test/normal/goto/file/cmd
diff --git a/test/unit/goto/file/in b/test/normal/goto/file/in
similarity index 100%
rename from test/unit/goto/file/in
rename to test/normal/goto/file/in
diff --git a/test/unit/goto/file/out b/test/normal/goto/file/out
similarity index 100%
rename from test/unit/goto/file/out
rename to test/normal/goto/file/out
diff --git a/test/unit/goto/file/rc b/test/normal/goto/file/rc
similarity index 100%
rename from test/unit/goto/file/rc
rename to test/normal/goto/file/rc
diff --git a/test/unit/goto/last-buffer/cmd b/test/normal/goto/last-buffer/cmd
similarity index 100%
rename from test/unit/goto/last-buffer/cmd
rename to test/normal/goto/last-buffer/cmd
diff --git a/test/unit/goto/last-buffer/out b/test/normal/goto/last-buffer/out
similarity index 100%
rename from test/unit/goto/last-buffer/out
rename to test/normal/goto/last-buffer/out
diff --git a/test/unit/goto/last-buffer/rc b/test/normal/goto/last-buffer/rc
similarity index 100%
rename from test/unit/goto/last-buffer/rc
rename to test/normal/goto/last-buffer/rc
diff --git a/test/unit/goto/last-change/cmd b/test/normal/goto/last-change/cmd
similarity index 100%
rename from test/unit/goto/last-change/cmd
rename to test/normal/goto/last-change/cmd
diff --git a/test/unit/goto/last-change/in b/test/normal/goto/last-change/in
similarity index 100%
rename from test/unit/goto/last-change/in
rename to test/normal/goto/last-change/in
diff --git a/test/unit/goto/last-change/selections b/test/normal/goto/last-change/selections
similarity index 100%
rename from test/unit/goto/last-change/selections
rename to test/normal/goto/last-change/selections
diff --git a/test/unit/goto/line-begin/cmd b/test/normal/goto/line-begin/cmd
similarity index 100%
rename from test/unit/goto/line-begin/cmd
rename to test/normal/goto/line-begin/cmd
diff --git a/test/unit/goto/line-begin/in b/test/normal/goto/line-begin/in
similarity index 100%
rename from test/unit/goto/line-begin/in
rename to test/normal/goto/line-begin/in
diff --git a/test/unit/goto/line-begin/selections b/test/normal/goto/line-begin/selections
similarity index 100%
rename from test/unit/goto/line-begin/selections
rename to test/normal/goto/line-begin/selections
diff --git a/test/unit/goto/line-end/cmd b/test/normal/goto/line-end/cmd
similarity index 100%
rename from test/unit/goto/line-end/cmd
rename to test/normal/goto/line-end/cmd
diff --git a/test/unit/goto/line-end/in b/test/normal/goto/line-end/in
similarity index 100%
rename from test/unit/goto/line-end/in
rename to test/normal/goto/line-end/in
diff --git a/test/unit/goto/line-end/selections b/test/normal/goto/line-end/selections
similarity index 100%
rename from test/unit/goto/line-end/selections
rename to test/normal/goto/line-end/selections
diff --git a/test/unit/indent/cmd b/test/normal/indent/cmd
similarity index 100%
rename from test/unit/indent/cmd
rename to test/normal/indent/cmd
diff --git a/test/unit/indent/in b/test/normal/indent/in
similarity index 100%
rename from test/unit/indent/in
rename to test/normal/indent/in
diff --git a/test/unit/indent/out b/test/normal/indent/out
similarity index 100%
rename from test/unit/indent/out
rename to test/normal/indent/out
diff --git a/test/unit/insert-at-line-start/cmd b/test/normal/insert-at-line-start/cmd
similarity index 100%
rename from test/unit/insert-at-line-start/cmd
rename to test/normal/insert-at-line-start/cmd
diff --git a/test/unit/insert-at-line-start/in b/test/normal/insert-at-line-start/in
similarity index 100%
rename from test/unit/insert-at-line-start/in
rename to test/normal/insert-at-line-start/in
diff --git a/test/unit/insert-at-line-start/out b/test/normal/insert-at-line-start/out
similarity index 100%
rename from test/unit/insert-at-line-start/out
rename to test/normal/insert-at-line-start/out
diff --git a/test/unit/insert-replace/cmd b/test/normal/insert-replace/cmd
similarity index 100%
rename from test/unit/insert-replace/cmd
rename to test/normal/insert-replace/cmd
diff --git a/test/unit/insert-replace/in b/test/normal/insert-replace/in
similarity index 100%
rename from test/unit/insert-replace/in
rename to test/normal/insert-replace/in
diff --git a/test/unit/insert-replace/out b/test/normal/insert-replace/out
similarity index 100%
rename from test/unit/insert-replace/out
rename to test/normal/insert-replace/out
diff --git a/test/unit/insert/cmd b/test/normal/insert/cmd
similarity index 100%
rename from test/unit/insert/cmd
rename to test/normal/insert/cmd
diff --git a/test/unit/insert/in b/test/normal/insert/in
similarity index 100%
rename from test/unit/insert/in
rename to test/normal/insert/in
diff --git a/test/unit/insert/out b/test/normal/insert/out
similarity index 100%
rename from test/unit/insert/out
rename to test/normal/insert/out
diff --git a/test/unit/keep-cmd/cmd b/test/normal/keep-cmd/cmd
similarity index 100%
rename from test/unit/keep-cmd/cmd
rename to test/normal/keep-cmd/cmd
diff --git a/test/unit/keep-cmd/in b/test/normal/keep-cmd/in
similarity index 100%
rename from test/unit/keep-cmd/in
rename to test/normal/keep-cmd/in
diff --git a/test/unit/keep-cmd/selections b/test/normal/keep-cmd/selections
similarity index 100%
rename from test/unit/keep-cmd/selections
rename to test/normal/keep-cmd/selections
diff --git a/test/unit/lower-case/cmd b/test/normal/lower-case/cmd
similarity index 100%
rename from test/unit/lower-case/cmd
rename to test/normal/lower-case/cmd
diff --git a/test/unit/lower-case/in b/test/normal/lower-case/in
similarity index 100%
rename from test/unit/lower-case/in
rename to test/normal/lower-case/in
diff --git a/test/unit/lower-case/selections b/test/normal/lower-case/selections
similarity index 100%
rename from test/unit/lower-case/selections
rename to test/normal/lower-case/selections
diff --git a/test/unit/match-char/cmd b/test/normal/match-char/cmd
similarity index 100%
rename from test/unit/match-char/cmd
rename to test/normal/match-char/cmd
diff --git a/test/unit/match-char/in b/test/normal/match-char/in
similarity index 100%
rename from test/unit/match-char/in
rename to test/normal/match-char/in
diff --git a/test/unit/match-char/selections b/test/normal/match-char/selections
similarity index 100%
rename from test/unit/match-char/selections
rename to test/normal/match-char/selections
diff --git a/test/unit/move/down-extending/cmd b/test/normal/move/down-extending/cmd
similarity index 100%
rename from test/unit/move/down-extending/cmd
rename to test/normal/move/down-extending/cmd
diff --git a/test/unit/move/down-extending/in b/test/normal/move/down-extending/in
similarity index 100%
rename from test/unit/move/down-extending/in
rename to test/normal/move/down-extending/in
diff --git a/test/unit/move/down-extending/selections b/test/normal/move/down-extending/selections
similarity index 100%
rename from test/unit/move/down-extending/selections
rename to test/normal/move/down-extending/selections
diff --git a/test/unit/move/down/cmd b/test/normal/move/down/cmd
similarity index 100%
rename from test/unit/move/down/cmd
rename to test/normal/move/down/cmd
diff --git a/test/unit/move/down/in b/test/normal/move/down/in
similarity index 100%
rename from test/unit/move/down/in
rename to test/normal/move/down/in
diff --git a/test/unit/move/down/selections b/test/normal/move/down/selections
similarity index 100%
rename from test/unit/move/down/selections
rename to test/normal/move/down/selections
diff --git a/test/unit/move/left-extending/cmd b/test/normal/move/left-extending/cmd
similarity index 100%
rename from test/unit/move/left-extending/cmd
rename to test/normal/move/left-extending/cmd
diff --git a/test/unit/move/left-extending/in b/test/normal/move/left-extending/in
similarity index 100%
rename from test/unit/move/left-extending/in
rename to test/normal/move/left-extending/in
diff --git a/test/unit/move/left-extending/selections b/test/normal/move/left-extending/selections
similarity index 100%
rename from test/unit/move/left-extending/selections
rename to test/normal/move/left-extending/selections
diff --git a/test/unit/move/left/cmd b/test/normal/move/left/cmd
similarity index 100%
rename from test/unit/move/left/cmd
rename to test/normal/move/left/cmd
diff --git a/test/unit/move/left/in b/test/normal/move/left/in
similarity index 100%
rename from test/unit/move/left/in
rename to test/normal/move/left/in
diff --git a/test/unit/move/left/selections b/test/normal/move/left/selections
similarity index 100%
rename from test/unit/move/left/selections
rename to test/normal/move/left/selections
diff --git a/test/unit/move/right-extending/cmd b/test/normal/move/right-extending/cmd
similarity index 100%
rename from test/unit/move/right-extending/cmd
rename to test/normal/move/right-extending/cmd
diff --git a/test/unit/move/right-extending/in b/test/normal/move/right-extending/in
similarity index 100%
rename from test/unit/move/right-extending/in
rename to test/normal/move/right-extending/in
diff --git a/test/unit/move/right-extending/selections b/test/normal/move/right-extending/selections
similarity index 100%
rename from test/unit/move/right-extending/selections
rename to test/normal/move/right-extending/selections
diff --git a/test/unit/move/right/cmd b/test/normal/move/right/cmd
similarity index 100%
rename from test/unit/move/right/cmd
rename to test/normal/move/right/cmd
diff --git a/test/unit/move/right/in b/test/normal/move/right/in
similarity index 100%
rename from test/unit/move/right/in
rename to test/normal/move/right/in
diff --git a/test/unit/move/right/selections b/test/normal/move/right/selections
similarity index 100%
rename from test/unit/move/right/selections
rename to test/normal/move/right/selections
diff --git a/test/unit/move/up-extending/cmd b/test/normal/move/up-extending/cmd
similarity index 100%
rename from test/unit/move/up-extending/cmd
rename to test/normal/move/up-extending/cmd
diff --git a/test/unit/move/up-extending/in b/test/normal/move/up-extending/in
similarity index 100%
rename from test/unit/move/up-extending/in
rename to test/normal/move/up-extending/in
diff --git a/test/unit/move/up-extending/selections b/test/normal/move/up-extending/selections
similarity index 100%
rename from test/unit/move/up-extending/selections
rename to test/normal/move/up-extending/selections
diff --git a/test/unit/move/up/cmd b/test/normal/move/up/cmd
similarity index 100%
rename from test/unit/move/up/cmd
rename to test/normal/move/up/cmd
diff --git a/test/unit/move/up/in b/test/normal/move/up/in
similarity index 100%
rename from test/unit/move/up/in
rename to test/normal/move/up/in
diff --git a/test/unit/move/up/selections b/test/normal/move/up/selections
similarity index 100%
rename from test/unit/move/up/selections
rename to test/normal/move/up/selections
diff --git a/test/unit/next-big-word-extending/cmd b/test/normal/next-big-word-extending/cmd
similarity index 100%
rename from test/unit/next-big-word-extending/cmd
rename to test/normal/next-big-word-extending/cmd
diff --git a/test/unit/next-big-word-extending/in b/test/normal/next-big-word-extending/in
similarity index 100%
rename from test/unit/next-big-word-extending/in
rename to test/normal/next-big-word-extending/in
diff --git a/test/unit/next-big-word-extending/selections b/test/normal/next-big-word-extending/selections
similarity index 100%
rename from test/unit/next-big-word-extending/selections
rename to test/normal/next-big-word-extending/selections
diff --git a/test/unit/next-big-word/cmd b/test/normal/next-big-word/cmd
similarity index 100%
rename from test/unit/next-big-word/cmd
rename to test/normal/next-big-word/cmd
diff --git a/test/unit/next-big-word/in b/test/normal/next-big-word/in
similarity index 100%
rename from test/unit/next-big-word/in
rename to test/normal/next-big-word/in
diff --git a/test/unit/next-big-word/selections b/test/normal/next-big-word/selections
similarity index 100%
rename from test/unit/next-big-word/selections
rename to test/normal/next-big-word/selections
diff --git a/test/unit/next-match-appending/cmd b/test/normal/next-match-appending/cmd
similarity index 100%
rename from test/unit/next-match-appending/cmd
rename to test/normal/next-match-appending/cmd
diff --git a/test/unit/next-match-appending/in b/test/normal/next-match-appending/in
similarity index 100%
rename from test/unit/next-match-appending/in
rename to test/normal/next-match-appending/in
diff --git a/test/unit/next-match-appending/rc b/test/normal/next-match-appending/rc
similarity index 100%
rename from test/unit/next-match-appending/rc
rename to test/normal/next-match-appending/rc
diff --git a/test/unit/next-match-appending/selections b/test/normal/next-match-appending/selections
similarity index 100%
rename from test/unit/next-match-appending/selections
rename to test/normal/next-match-appending/selections
diff --git a/test/unit/next-match/cmd b/test/normal/next-match/cmd
similarity index 100%
rename from test/unit/next-match/cmd
rename to test/normal/next-match/cmd
diff --git a/test/unit/next-match/in b/test/normal/next-match/in
similarity index 100%
rename from test/unit/next-match/in
rename to test/normal/next-match/in
diff --git a/test/unit/next-match/rc b/test/normal/next-match/rc
similarity index 100%
rename from test/unit/next-match/rc
rename to test/normal/next-match/rc
diff --git a/test/unit/next-match/selections b/test/normal/next-match/selections
similarity index 100%
rename from test/unit/next-match/selections
rename to test/normal/next-match/selections
diff --git a/test/unit/next-word-extending/cmd b/test/normal/next-word-extending/cmd
similarity index 100%
rename from test/unit/next-word-extending/cmd
rename to test/normal/next-word-extending/cmd
diff --git a/test/unit/next-word-extending/in b/test/normal/next-word-extending/in
similarity index 100%
rename from test/unit/next-word-extending/in
rename to test/normal/next-word-extending/in
diff --git a/test/unit/next-word-extending/selections b/test/normal/next-word-extending/selections
similarity index 100%
rename from test/unit/next-word-extending/selections
rename to test/normal/next-word-extending/selections
diff --git a/test/unit/next-word/cmd b/test/normal/next-word/cmd
similarity index 100%
rename from test/unit/next-word/cmd
rename to test/normal/next-word/cmd
diff --git a/test/unit/next-word/in b/test/normal/next-word/in
similarity index 100%
rename from test/unit/next-word/in
rename to test/normal/next-word/in
diff --git a/test/unit/next-word/selections b/test/normal/next-word/selections
similarity index 100%
rename from test/unit/next-word/selections
rename to test/normal/next-word/selections
diff --git a/test/unit/object/around/angle/cmd b/test/normal/object/around/angle/cmd
similarity index 100%
rename from test/unit/object/around/angle/cmd
rename to test/normal/object/around/angle/cmd
diff --git a/test/unit/object/around/angle/in b/test/normal/object/around/angle/in
similarity index 100%
rename from test/unit/object/around/angle/in
rename to test/normal/object/around/angle/in
diff --git a/test/unit/object/around/angle/selections b/test/normal/object/around/angle/selections
similarity index 100%
rename from test/unit/object/around/angle/selections
rename to test/normal/object/around/angle/selections
diff --git a/test/unit/object/around/argument/multi-level/cmd b/test/normal/object/around/argument/multi-level/cmd
similarity index 100%
rename from test/unit/object/around/argument/multi-level/cmd
rename to test/normal/object/around/argument/multi-level/cmd
diff --git a/test/unit/object/around/argument/multi-level/in b/test/normal/object/around/argument/multi-level/in
similarity index 100%
rename from test/unit/object/around/argument/multi-level/in
rename to test/normal/object/around/argument/multi-level/in
diff --git a/test/unit/object/around/argument/multi-level/selections b/test/normal/object/around/argument/multi-level/selections
similarity index 100%
rename from test/unit/object/around/argument/multi-level/selections
rename to test/normal/object/around/argument/multi-level/selections
diff --git a/test/unit/object/around/argument/single-level/cmd b/test/normal/object/around/argument/single-level/cmd
similarity index 100%
rename from test/unit/object/around/argument/single-level/cmd
rename to test/normal/object/around/argument/single-level/cmd
diff --git a/test/unit/object/around/argument/single-level/in b/test/normal/object/around/argument/single-level/in
similarity index 100%
rename from test/unit/object/around/argument/single-level/in
rename to test/normal/object/around/argument/single-level/in
diff --git a/test/unit/object/around/argument/single-level/selections b/test/normal/object/around/argument/single-level/selections
similarity index 100%
rename from test/unit/object/around/argument/single-level/selections
rename to test/normal/object/around/argument/single-level/selections
diff --git a/test/unit/object/around/big-word/cmd b/test/normal/object/around/big-word/cmd
similarity index 100%
rename from test/unit/object/around/big-word/cmd
rename to test/normal/object/around/big-word/cmd
diff --git a/test/unit/object/around/big-word/in b/test/normal/object/around/big-word/in
similarity index 100%
rename from test/unit/object/around/big-word/in
rename to test/normal/object/around/big-word/in
diff --git a/test/unit/object/around/big-word/selections b/test/normal/object/around/big-word/selections
similarity index 100%
rename from test/unit/object/around/big-word/selections
rename to test/normal/object/around/big-word/selections
diff --git a/test/unit/object/around/braces/cmd b/test/normal/object/around/braces/cmd
similarity index 100%
rename from test/unit/object/around/braces/cmd
rename to test/normal/object/around/braces/cmd
diff --git a/test/unit/object/around/braces/in b/test/normal/object/around/braces/in
similarity index 100%
rename from test/unit/object/around/braces/in
rename to test/normal/object/around/braces/in
diff --git a/test/unit/object/around/braces/selections b/test/normal/object/around/braces/selections
similarity index 100%
rename from test/unit/object/around/braces/selections
rename to test/normal/object/around/braces/selections
diff --git a/test/unit/object/around/brackets/cmd b/test/normal/object/around/brackets/cmd
similarity index 100%
rename from test/unit/object/around/brackets/cmd
rename to test/normal/object/around/brackets/cmd
diff --git a/test/unit/object/around/brackets/in b/test/normal/object/around/brackets/in
similarity index 100%
rename from test/unit/object/around/brackets/in
rename to test/normal/object/around/brackets/in
diff --git a/test/unit/object/around/brackets/selections b/test/normal/object/around/brackets/selections
similarity index 100%
rename from test/unit/object/around/brackets/selections
rename to test/normal/object/around/brackets/selections
diff --git a/test/unit/object/around/double_quote/cmd b/test/normal/object/around/double_quote/cmd
similarity index 100%
rename from test/unit/object/around/double_quote/cmd
rename to test/normal/object/around/double_quote/cmd
diff --git a/test/unit/object/around/double_quote/in b/test/normal/object/around/double_quote/in
similarity index 100%
rename from test/unit/object/around/double_quote/in
rename to test/normal/object/around/double_quote/in
diff --git a/test/unit/object/around/double_quote/selections b/test/normal/object/around/double_quote/selections
similarity index 100%
rename from test/unit/object/around/double_quote/selections
rename to test/normal/object/around/double_quote/selections
diff --git a/test/unit/object/around/grave_quote/cmd b/test/normal/object/around/grave_quote/cmd
similarity index 100%
rename from test/unit/object/around/grave_quote/cmd
rename to test/normal/object/around/grave_quote/cmd
diff --git a/test/unit/object/around/grave_quote/in b/test/normal/object/around/grave_quote/in
similarity index 100%
rename from test/unit/object/around/grave_quote/in
rename to test/normal/object/around/grave_quote/in
diff --git a/test/unit/object/around/grave_quote/selections b/test/normal/object/around/grave_quote/selections
similarity index 100%
rename from test/unit/object/around/grave_quote/selections
rename to test/normal/object/around/grave_quote/selections
diff --git a/test/unit/object/around/indent/cmd b/test/normal/object/around/indent/cmd
similarity index 100%
rename from test/unit/object/around/indent/cmd
rename to test/normal/object/around/indent/cmd
diff --git a/test/unit/object/around/indent/in b/test/normal/object/around/indent/in
similarity index 100%
rename from test/unit/object/around/indent/in
rename to test/normal/object/around/indent/in
diff --git a/test/unit/object/around/indent/selections b/test/normal/object/around/indent/selections
similarity index 100%
rename from test/unit/object/around/indent/selections
rename to test/normal/object/around/indent/selections
diff --git a/test/unit/object/around/paragraph/cmd b/test/normal/object/around/paragraph/cmd
similarity index 100%
rename from test/unit/object/around/paragraph/cmd
rename to test/normal/object/around/paragraph/cmd
diff --git a/test/unit/object/around/paragraph/in b/test/normal/object/around/paragraph/in
similarity index 100%
rename from test/unit/object/around/paragraph/in
rename to test/normal/object/around/paragraph/in
diff --git a/test/unit/object/around/paragraph/selections b/test/normal/object/around/paragraph/selections
similarity index 100%
rename from test/unit/object/around/paragraph/selections
rename to test/normal/object/around/paragraph/selections
diff --git a/test/unit/object/around/parenthesis/cmd b/test/normal/object/around/parenthesis/cmd
similarity index 100%
rename from test/unit/object/around/parenthesis/cmd
rename to test/normal/object/around/parenthesis/cmd
diff --git a/test/unit/object/around/parenthesis/in b/test/normal/object/around/parenthesis/in
similarity index 100%
rename from test/unit/object/around/parenthesis/in
rename to test/normal/object/around/parenthesis/in
diff --git a/test/unit/object/around/parenthesis/selections b/test/normal/object/around/parenthesis/selections
similarity index 100%
rename from test/unit/object/around/parenthesis/selections
rename to test/normal/object/around/parenthesis/selections
diff --git a/test/unit/object/around/sentence/cmd b/test/normal/object/around/sentence/cmd
similarity index 100%
rename from test/unit/object/around/sentence/cmd
rename to test/normal/object/around/sentence/cmd
diff --git a/test/unit/object/around/sentence/in b/test/normal/object/around/sentence/in
similarity index 100%
rename from test/unit/object/around/sentence/in
rename to test/normal/object/around/sentence/in
diff --git a/test/unit/object/around/sentence/selections b/test/normal/object/around/sentence/selections
similarity index 100%
rename from test/unit/object/around/sentence/selections
rename to test/normal/object/around/sentence/selections
diff --git a/test/unit/object/around/single_quote/cmd b/test/normal/object/around/single_quote/cmd
similarity index 100%
rename from test/unit/object/around/single_quote/cmd
rename to test/normal/object/around/single_quote/cmd
diff --git a/test/unit/object/around/single_quote/in b/test/normal/object/around/single_quote/in
similarity index 100%
rename from test/unit/object/around/single_quote/in
rename to test/normal/object/around/single_quote/in
diff --git a/test/unit/object/around/single_quote/selections b/test/normal/object/around/single_quote/selections
similarity index 100%
rename from test/unit/object/around/single_quote/selections
rename to test/normal/object/around/single_quote/selections
diff --git a/test/unit/object/around/slash/cmd b/test/normal/object/around/slash/cmd
similarity index 100%
rename from test/unit/object/around/slash/cmd
rename to test/normal/object/around/slash/cmd
diff --git a/test/unit/object/around/slash/in b/test/normal/object/around/slash/in
similarity index 100%
rename from test/unit/object/around/slash/in
rename to test/normal/object/around/slash/in
diff --git a/test/unit/object/around/slash/selections b/test/normal/object/around/slash/selections
similarity index 100%
rename from test/unit/object/around/slash/selections
rename to test/normal/object/around/slash/selections
diff --git a/test/unit/object/around/word/cmd b/test/normal/object/around/word/cmd
similarity index 100%
rename from test/unit/object/around/word/cmd
rename to test/normal/object/around/word/cmd
diff --git a/test/unit/object/around/word/in b/test/normal/object/around/word/in
similarity index 100%
rename from test/unit/object/around/word/in
rename to test/normal/object/around/word/in
diff --git a/test/unit/object/around/word/selections b/test/normal/object/around/word/selections
similarity index 100%
rename from test/unit/object/around/word/selections
rename to test/normal/object/around/word/selections
diff --git a/test/unit/object/drop-non-whitespace/cmd b/test/normal/object/drop-non-whitespace/cmd
similarity index 100%
rename from test/unit/object/drop-non-whitespace/cmd
rename to test/normal/object/drop-non-whitespace/cmd
diff --git a/test/unit/object/drop-non-whitespace/in b/test/normal/object/drop-non-whitespace/in
similarity index 100%
rename from test/unit/object/drop-non-whitespace/in
rename to test/normal/object/drop-non-whitespace/in
diff --git a/test/unit/object/drop-non-whitespace/selections b/test/normal/object/drop-non-whitespace/selections
similarity index 100%
rename from test/unit/object/drop-non-whitespace/selections
rename to test/normal/object/drop-non-whitespace/selections
diff --git a/test/unit/object/end-extending/angle/cmd b/test/normal/object/end-extending/angle/cmd
similarity index 100%
rename from test/unit/object/end-extending/angle/cmd
rename to test/normal/object/end-extending/angle/cmd
diff --git a/test/unit/object/end-extending/angle/in b/test/normal/object/end-extending/angle/in
similarity index 100%
rename from test/unit/object/end-extending/angle/in
rename to test/normal/object/end-extending/angle/in
diff --git a/test/unit/object/end-extending/angle/selections b/test/normal/object/end-extending/angle/selections
similarity index 100%
rename from test/unit/object/end-extending/angle/selections
rename to test/normal/object/end-extending/angle/selections
diff --git a/test/unit/object/end-extending/argument/cmd b/test/normal/object/end-extending/argument/cmd
similarity index 100%
rename from test/unit/object/end-extending/argument/cmd
rename to test/normal/object/end-extending/argument/cmd
diff --git a/test/unit/object/end-extending/argument/in b/test/normal/object/end-extending/argument/in
similarity index 100%
rename from test/unit/object/end-extending/argument/in
rename to test/normal/object/end-extending/argument/in
diff --git a/test/unit/object/end-extending/argument/selections b/test/normal/object/end-extending/argument/selections
similarity index 100%
rename from test/unit/object/end-extending/argument/selections
rename to test/normal/object/end-extending/argument/selections
diff --git a/test/unit/object/end-extending/big-word/cmd b/test/normal/object/end-extending/big-word/cmd
similarity index 100%
rename from test/unit/object/end-extending/big-word/cmd
rename to test/normal/object/end-extending/big-word/cmd
diff --git a/test/unit/object/end-extending/big-word/in b/test/normal/object/end-extending/big-word/in
similarity index 100%
rename from test/unit/object/end-extending/big-word/in
rename to test/normal/object/end-extending/big-word/in
diff --git a/test/unit/object/end-extending/big-word/selections b/test/normal/object/end-extending/big-word/selections
similarity index 100%
rename from test/unit/object/end-extending/big-word/selections
rename to test/normal/object/end-extending/big-word/selections
diff --git a/test/unit/object/end-extending/braces/cmd b/test/normal/object/end-extending/braces/cmd
similarity index 100%
rename from test/unit/object/end-extending/braces/cmd
rename to test/normal/object/end-extending/braces/cmd
diff --git a/test/unit/object/end-extending/braces/in b/test/normal/object/end-extending/braces/in
similarity index 100%
rename from test/unit/object/end-extending/braces/in
rename to test/normal/object/end-extending/braces/in
diff --git a/test/unit/object/end-extending/braces/selections b/test/normal/object/end-extending/braces/selections
similarity index 100%
rename from test/unit/object/end-extending/braces/selections
rename to test/normal/object/end-extending/braces/selections
diff --git a/test/unit/object/end-extending/brackets/cmd b/test/normal/object/end-extending/brackets/cmd
similarity index 100%
rename from test/unit/object/end-extending/brackets/cmd
rename to test/normal/object/end-extending/brackets/cmd
diff --git a/test/unit/object/end-extending/brackets/in b/test/normal/object/end-extending/brackets/in
similarity index 100%
rename from test/unit/object/end-extending/brackets/in
rename to test/normal/object/end-extending/brackets/in
diff --git a/test/unit/object/end-extending/brackets/selections b/test/normal/object/end-extending/brackets/selections
similarity index 100%
rename from test/unit/object/end-extending/brackets/selections
rename to test/normal/object/end-extending/brackets/selections
diff --git a/test/unit/object/end-extending/double_quote/cmd b/test/normal/object/end-extending/double_quote/cmd
similarity index 100%
rename from test/unit/object/end-extending/double_quote/cmd
rename to test/normal/object/end-extending/double_quote/cmd
diff --git a/test/unit/object/end-extending/double_quote/in b/test/normal/object/end-extending/double_quote/in
similarity index 100%
rename from test/unit/object/end-extending/double_quote/in
rename to test/normal/object/end-extending/double_quote/in
diff --git a/test/unit/object/end-extending/double_quote/selections b/test/normal/object/end-extending/double_quote/selections
similarity index 100%
rename from test/unit/object/end-extending/double_quote/selections
rename to test/normal/object/end-extending/double_quote/selections
diff --git a/test/unit/object/end-extending/grave_quote/cmd b/test/normal/object/end-extending/grave_quote/cmd
similarity index 100%
rename from test/unit/object/end-extending/grave_quote/cmd
rename to test/normal/object/end-extending/grave_quote/cmd
diff --git a/test/unit/object/end-extending/grave_quote/in b/test/normal/object/end-extending/grave_quote/in
similarity index 100%
rename from test/unit/object/end-extending/grave_quote/in
rename to test/normal/object/end-extending/grave_quote/in
diff --git a/test/unit/object/end-extending/grave_quote/selections b/test/normal/object/end-extending/grave_quote/selections
similarity index 100%
rename from test/unit/object/end-extending/grave_quote/selections
rename to test/normal/object/end-extending/grave_quote/selections
diff --git a/test/unit/object/end-extending/indent/cmd b/test/normal/object/end-extending/indent/cmd
similarity index 100%
rename from test/unit/object/end-extending/indent/cmd
rename to test/normal/object/end-extending/indent/cmd
diff --git a/test/unit/object/end-extending/indent/in b/test/normal/object/end-extending/indent/in
similarity index 100%
rename from test/unit/object/end-extending/indent/in
rename to test/normal/object/end-extending/indent/in
diff --git a/test/unit/object/end-extending/indent/selections b/test/normal/object/end-extending/indent/selections
similarity index 100%
rename from test/unit/object/end-extending/indent/selections
rename to test/normal/object/end-extending/indent/selections
diff --git a/test/unit/object/end-extending/paragraph/cmd b/test/normal/object/end-extending/paragraph/cmd
similarity index 100%
rename from test/unit/object/end-extending/paragraph/cmd
rename to test/normal/object/end-extending/paragraph/cmd
diff --git a/test/unit/object/end-extending/paragraph/in b/test/normal/object/end-extending/paragraph/in
similarity index 100%
rename from test/unit/object/end-extending/paragraph/in
rename to test/normal/object/end-extending/paragraph/in
diff --git a/test/unit/object/end-extending/paragraph/selections b/test/normal/object/end-extending/paragraph/selections
similarity index 100%
rename from test/unit/object/end-extending/paragraph/selections
rename to test/normal/object/end-extending/paragraph/selections
diff --git a/test/unit/object/end-extending/parenthesis/cmd b/test/normal/object/end-extending/parenthesis/cmd
similarity index 100%
rename from test/unit/object/end-extending/parenthesis/cmd
rename to test/normal/object/end-extending/parenthesis/cmd
diff --git a/test/unit/object/end-extending/parenthesis/in b/test/normal/object/end-extending/parenthesis/in
similarity index 100%
rename from test/unit/object/end-extending/parenthesis/in
rename to test/normal/object/end-extending/parenthesis/in
diff --git a/test/unit/object/end-extending/parenthesis/selections b/test/normal/object/end-extending/parenthesis/selections
similarity index 100%
rename from test/unit/object/end-extending/parenthesis/selections
rename to test/normal/object/end-extending/parenthesis/selections
diff --git a/test/unit/object/end-extending/sentence/cmd b/test/normal/object/end-extending/sentence/cmd
similarity index 100%
rename from test/unit/object/end-extending/sentence/cmd
rename to test/normal/object/end-extending/sentence/cmd
diff --git a/test/unit/object/end-extending/sentence/in b/test/normal/object/end-extending/sentence/in
similarity index 100%
rename from test/unit/object/end-extending/sentence/in
rename to test/normal/object/end-extending/sentence/in
diff --git a/test/unit/object/end-extending/sentence/selections b/test/normal/object/end-extending/sentence/selections
similarity index 100%
rename from test/unit/object/end-extending/sentence/selections
rename to test/normal/object/end-extending/sentence/selections
diff --git a/test/unit/object/end-extending/single_quote/cmd b/test/normal/object/end-extending/single_quote/cmd
similarity index 100%
rename from test/unit/object/end-extending/single_quote/cmd
rename to test/normal/object/end-extending/single_quote/cmd
diff --git a/test/unit/object/end-extending/single_quote/in b/test/normal/object/end-extending/single_quote/in
similarity index 100%
rename from test/unit/object/end-extending/single_quote/in
rename to test/normal/object/end-extending/single_quote/in
diff --git a/test/unit/object/end-extending/single_quote/selections b/test/normal/object/end-extending/single_quote/selections
similarity index 100%
rename from test/unit/object/end-extending/single_quote/selections
rename to test/normal/object/end-extending/single_quote/selections
diff --git a/test/unit/object/end-extending/word/cmd b/test/normal/object/end-extending/word/cmd
similarity index 100%
rename from test/unit/object/end-extending/word/cmd
rename to test/normal/object/end-extending/word/cmd
diff --git a/test/unit/object/end-extending/word/in b/test/normal/object/end-extending/word/in
similarity index 100%
rename from test/unit/object/end-extending/word/in
rename to test/normal/object/end-extending/word/in
diff --git a/test/unit/object/end-extending/word/selections b/test/normal/object/end-extending/word/selections
similarity index 100%
rename from test/unit/object/end-extending/word/selections
rename to test/normal/object/end-extending/word/selections
diff --git a/test/unit/object/end/angle/cmd b/test/normal/object/end/angle/cmd
similarity index 100%
rename from test/unit/object/end/angle/cmd
rename to test/normal/object/end/angle/cmd
diff --git a/test/unit/object/end/angle/in b/test/normal/object/end/angle/in
similarity index 100%
rename from test/unit/object/end/angle/in
rename to test/normal/object/end/angle/in
diff --git a/test/unit/object/end/angle/selections b/test/normal/object/end/angle/selections
similarity index 100%
rename from test/unit/object/end/angle/selections
rename to test/normal/object/end/angle/selections
diff --git a/test/unit/object/end/argument/cmd b/test/normal/object/end/argument/cmd
similarity index 100%
rename from test/unit/object/end/argument/cmd
rename to test/normal/object/end/argument/cmd
diff --git a/test/unit/object/end/argument/in b/test/normal/object/end/argument/in
similarity index 100%
rename from test/unit/object/end/argument/in
rename to test/normal/object/end/argument/in
diff --git a/test/unit/object/end/argument/selections b/test/normal/object/end/argument/selections
similarity index 100%
rename from test/unit/object/end/argument/selections
rename to test/normal/object/end/argument/selections
diff --git a/test/unit/object/end/big-word/cmd b/test/normal/object/end/big-word/cmd
similarity index 100%
rename from test/unit/object/end/big-word/cmd
rename to test/normal/object/end/big-word/cmd
diff --git a/test/unit/object/end/big-word/in b/test/normal/object/end/big-word/in
similarity index 100%
rename from test/unit/object/end/big-word/in
rename to test/normal/object/end/big-word/in
diff --git a/test/unit/object/end/big-word/selections b/test/normal/object/end/big-word/selections
similarity index 100%
rename from test/unit/object/end/big-word/selections
rename to test/normal/object/end/big-word/selections
diff --git a/test/unit/object/end/braces/cmd b/test/normal/object/end/braces/cmd
similarity index 100%
rename from test/unit/object/end/braces/cmd
rename to test/normal/object/end/braces/cmd
diff --git a/test/unit/object/end/braces/in b/test/normal/object/end/braces/in
similarity index 100%
rename from test/unit/object/end/braces/in
rename to test/normal/object/end/braces/in
diff --git a/test/unit/object/end/braces/selections b/test/normal/object/end/braces/selections
similarity index 100%
rename from test/unit/object/end/braces/selections
rename to test/normal/object/end/braces/selections
diff --git a/test/unit/object/end/brackets/cmd b/test/normal/object/end/brackets/cmd
similarity index 100%
rename from test/unit/object/end/brackets/cmd
rename to test/normal/object/end/brackets/cmd
diff --git a/test/unit/object/end/brackets/in b/test/normal/object/end/brackets/in
similarity index 100%
rename from test/unit/object/end/brackets/in
rename to test/normal/object/end/brackets/in
diff --git a/test/unit/object/end/brackets/selections b/test/normal/object/end/brackets/selections
similarity index 100%
rename from test/unit/object/end/brackets/selections
rename to test/normal/object/end/brackets/selections
diff --git a/test/unit/object/end/double_quote/cmd b/test/normal/object/end/double_quote/cmd
similarity index 100%
rename from test/unit/object/end/double_quote/cmd
rename to test/normal/object/end/double_quote/cmd
diff --git a/test/unit/object/end/double_quote/in b/test/normal/object/end/double_quote/in
similarity index 100%
rename from test/unit/object/end/double_quote/in
rename to test/normal/object/end/double_quote/in
diff --git a/test/unit/object/end/double_quote/selections b/test/normal/object/end/double_quote/selections
similarity index 100%
rename from test/unit/object/end/double_quote/selections
rename to test/normal/object/end/double_quote/selections
diff --git a/test/unit/object/end/grave_quote/cmd b/test/normal/object/end/grave_quote/cmd
similarity index 100%
rename from test/unit/object/end/grave_quote/cmd
rename to test/normal/object/end/grave_quote/cmd
diff --git a/test/unit/object/end/grave_quote/in b/test/normal/object/end/grave_quote/in
similarity index 100%
rename from test/unit/object/end/grave_quote/in
rename to test/normal/object/end/grave_quote/in
diff --git a/test/unit/object/end/grave_quote/selections b/test/normal/object/end/grave_quote/selections
similarity index 100%
rename from test/unit/object/end/grave_quote/selections
rename to test/normal/object/end/grave_quote/selections
diff --git a/test/unit/object/end/indent/cmd b/test/normal/object/end/indent/cmd
similarity index 100%
rename from test/unit/object/end/indent/cmd
rename to test/normal/object/end/indent/cmd
diff --git a/test/unit/object/end/indent/in b/test/normal/object/end/indent/in
similarity index 100%
rename from test/unit/object/end/indent/in
rename to test/normal/object/end/indent/in
diff --git a/test/unit/object/end/indent/selections b/test/normal/object/end/indent/selections
similarity index 100%
rename from test/unit/object/end/indent/selections
rename to test/normal/object/end/indent/selections
diff --git a/test/unit/object/end/paragraph/cmd b/test/normal/object/end/paragraph/cmd
similarity index 100%
rename from test/unit/object/end/paragraph/cmd
rename to test/normal/object/end/paragraph/cmd
diff --git a/test/unit/object/end/paragraph/in b/test/normal/object/end/paragraph/in
similarity index 100%
rename from test/unit/object/end/paragraph/in
rename to test/normal/object/end/paragraph/in
diff --git a/test/unit/object/end/paragraph/selections b/test/normal/object/end/paragraph/selections
similarity index 100%
rename from test/unit/object/end/paragraph/selections
rename to test/normal/object/end/paragraph/selections
diff --git a/test/unit/object/end/parenthesis/cmd b/test/normal/object/end/parenthesis/cmd
similarity index 100%
rename from test/unit/object/end/parenthesis/cmd
rename to test/normal/object/end/parenthesis/cmd
diff --git a/test/unit/object/end/parenthesis/in b/test/normal/object/end/parenthesis/in
similarity index 100%
rename from test/unit/object/end/parenthesis/in
rename to test/normal/object/end/parenthesis/in
diff --git a/test/unit/object/end/parenthesis/selections b/test/normal/object/end/parenthesis/selections
similarity index 100%
rename from test/unit/object/end/parenthesis/selections
rename to test/normal/object/end/parenthesis/selections
diff --git a/test/unit/object/end/sentence/cmd b/test/normal/object/end/sentence/cmd
similarity index 100%
rename from test/unit/object/end/sentence/cmd
rename to test/normal/object/end/sentence/cmd
diff --git a/test/unit/object/end/sentence/in b/test/normal/object/end/sentence/in
similarity index 100%
rename from test/unit/object/end/sentence/in
rename to test/normal/object/end/sentence/in
diff --git a/test/unit/object/end/sentence/selections b/test/normal/object/end/sentence/selections
similarity index 100%
rename from test/unit/object/end/sentence/selections
rename to test/normal/object/end/sentence/selections
diff --git a/test/unit/object/end/single_quote/cmd b/test/normal/object/end/single_quote/cmd
similarity index 100%
rename from test/unit/object/end/single_quote/cmd
rename to test/normal/object/end/single_quote/cmd
diff --git a/test/unit/object/end/single_quote/in b/test/normal/object/end/single_quote/in
similarity index 100%
rename from test/unit/object/end/single_quote/in
rename to test/normal/object/end/single_quote/in
diff --git a/test/unit/object/end/single_quote/selections b/test/normal/object/end/single_quote/selections
similarity index 100%
rename from test/unit/object/end/single_quote/selections
rename to test/normal/object/end/single_quote/selections
diff --git a/test/unit/object/end/word/cmd b/test/normal/object/end/word/cmd
similarity index 100%
rename from test/unit/object/end/word/cmd
rename to test/normal/object/end/word/cmd
diff --git a/test/unit/object/end/word/in b/test/normal/object/end/word/in
similarity index 100%
rename from test/unit/object/end/word/in
rename to test/normal/object/end/word/in
diff --git a/test/unit/object/end/word/selections b/test/normal/object/end/word/selections
similarity index 100%
rename from test/unit/object/end/word/selections
rename to test/normal/object/end/word/selections
diff --git a/test/unit/object/inner/angle/cmd b/test/normal/object/inner/angle/cmd
similarity index 100%
rename from test/unit/object/inner/angle/cmd
rename to test/normal/object/inner/angle/cmd
diff --git a/test/unit/object/inner/angle/in b/test/normal/object/inner/angle/in
similarity index 100%
rename from test/unit/object/inner/angle/in
rename to test/normal/object/inner/angle/in
diff --git a/test/unit/object/inner/angle/selections b/test/normal/object/inner/angle/selections
similarity index 100%
rename from test/unit/object/inner/angle/selections
rename to test/normal/object/inner/angle/selections
diff --git a/test/unit/object/inner/argument/multi-level/cmd b/test/normal/object/inner/argument/multi-level/cmd
similarity index 100%
rename from test/unit/object/inner/argument/multi-level/cmd
rename to test/normal/object/inner/argument/multi-level/cmd
diff --git a/test/unit/object/inner/argument/multi-level/in b/test/normal/object/inner/argument/multi-level/in
similarity index 100%
rename from test/unit/object/inner/argument/multi-level/in
rename to test/normal/object/inner/argument/multi-level/in
diff --git a/test/unit/object/inner/argument/multi-level/selections b/test/normal/object/inner/argument/multi-level/selections
similarity index 100%
rename from test/unit/object/inner/argument/multi-level/selections
rename to test/normal/object/inner/argument/multi-level/selections
diff --git a/test/unit/object/inner/argument/single-level/cmd b/test/normal/object/inner/argument/single-level/cmd
similarity index 100%
rename from test/unit/object/inner/argument/single-level/cmd
rename to test/normal/object/inner/argument/single-level/cmd
diff --git a/test/unit/object/inner/argument/single-level/in b/test/normal/object/inner/argument/single-level/in
similarity index 100%
rename from test/unit/object/inner/argument/single-level/in
rename to test/normal/object/inner/argument/single-level/in
diff --git a/test/unit/object/inner/argument/single-level/selections b/test/normal/object/inner/argument/single-level/selections
similarity index 100%
rename from test/unit/object/inner/argument/single-level/selections
rename to test/normal/object/inner/argument/single-level/selections
diff --git a/test/unit/object/inner/big-word/cmd b/test/normal/object/inner/big-word/cmd
similarity index 100%
rename from test/unit/object/inner/big-word/cmd
rename to test/normal/object/inner/big-word/cmd
diff --git a/test/unit/object/inner/big-word/in b/test/normal/object/inner/big-word/in
similarity index 100%
rename from test/unit/object/inner/big-word/in
rename to test/normal/object/inner/big-word/in
diff --git a/test/unit/object/inner/big-word/selections b/test/normal/object/inner/big-word/selections
similarity index 100%
rename from test/unit/object/inner/big-word/selections
rename to test/normal/object/inner/big-word/selections
diff --git a/test/unit/object/inner/braces/cmd b/test/normal/object/inner/braces/cmd
similarity index 100%
rename from test/unit/object/inner/braces/cmd
rename to test/normal/object/inner/braces/cmd
diff --git a/test/unit/object/inner/braces/in b/test/normal/object/inner/braces/in
similarity index 100%
rename from test/unit/object/inner/braces/in
rename to test/normal/object/inner/braces/in
diff --git a/test/unit/object/inner/braces/selections b/test/normal/object/inner/braces/selections
similarity index 100%
rename from test/unit/object/inner/braces/selections
rename to test/normal/object/inner/braces/selections
diff --git a/test/unit/object/inner/brackets/cmd b/test/normal/object/inner/brackets/cmd
similarity index 100%
rename from test/unit/object/inner/brackets/cmd
rename to test/normal/object/inner/brackets/cmd
diff --git a/test/unit/object/inner/brackets/in b/test/normal/object/inner/brackets/in
similarity index 100%
rename from test/unit/object/inner/brackets/in
rename to test/normal/object/inner/brackets/in
diff --git a/test/unit/object/inner/brackets/selections b/test/normal/object/inner/brackets/selections
similarity index 100%
rename from test/unit/object/inner/brackets/selections
rename to test/normal/object/inner/brackets/selections
diff --git a/test/unit/object/inner/double_quote/cmd b/test/normal/object/inner/double_quote/cmd
similarity index 100%
rename from test/unit/object/inner/double_quote/cmd
rename to test/normal/object/inner/double_quote/cmd
diff --git a/test/unit/object/inner/double_quote/in b/test/normal/object/inner/double_quote/in
similarity index 100%
rename from test/unit/object/inner/double_quote/in
rename to test/normal/object/inner/double_quote/in
diff --git a/test/unit/object/inner/double_quote/selections b/test/normal/object/inner/double_quote/selections
similarity index 100%
rename from test/unit/object/inner/double_quote/selections
rename to test/normal/object/inner/double_quote/selections
diff --git a/test/unit/object/inner/grave_quote/cmd b/test/normal/object/inner/grave_quote/cmd
similarity index 100%
rename from test/unit/object/inner/grave_quote/cmd
rename to test/normal/object/inner/grave_quote/cmd
diff --git a/test/unit/object/inner/grave_quote/in b/test/normal/object/inner/grave_quote/in
similarity index 100%
rename from test/unit/object/inner/grave_quote/in
rename to test/normal/object/inner/grave_quote/in
diff --git a/test/unit/object/inner/grave_quote/selections b/test/normal/object/inner/grave_quote/selections
similarity index 100%
rename from test/unit/object/inner/grave_quote/selections
rename to test/normal/object/inner/grave_quote/selections
diff --git a/test/unit/object/inner/indent/cmd b/test/normal/object/inner/indent/cmd
similarity index 100%
rename from test/unit/object/inner/indent/cmd
rename to test/normal/object/inner/indent/cmd
diff --git a/test/unit/object/inner/indent/in b/test/normal/object/inner/indent/in
similarity index 100%
rename from test/unit/object/inner/indent/in
rename to test/normal/object/inner/indent/in
diff --git a/test/unit/object/inner/indent/selections b/test/normal/object/inner/indent/selections
similarity index 100%
rename from test/unit/object/inner/indent/selections
rename to test/normal/object/inner/indent/selections
diff --git a/test/unit/object/inner/paragraph/cmd b/test/normal/object/inner/paragraph/cmd
similarity index 100%
rename from test/unit/object/inner/paragraph/cmd
rename to test/normal/object/inner/paragraph/cmd
diff --git a/test/unit/object/inner/paragraph/in b/test/normal/object/inner/paragraph/in
similarity index 100%
rename from test/unit/object/inner/paragraph/in
rename to test/normal/object/inner/paragraph/in
diff --git a/test/unit/object/inner/paragraph/selections b/test/normal/object/inner/paragraph/selections
similarity index 100%
rename from test/unit/object/inner/paragraph/selections
rename to test/normal/object/inner/paragraph/selections
diff --git a/test/unit/object/inner/parenthesis/cmd b/test/normal/object/inner/parenthesis/cmd
similarity index 100%
rename from test/unit/object/inner/parenthesis/cmd
rename to test/normal/object/inner/parenthesis/cmd
diff --git a/test/unit/object/inner/parenthesis/in b/test/normal/object/inner/parenthesis/in
similarity index 100%
rename from test/unit/object/inner/parenthesis/in
rename to test/normal/object/inner/parenthesis/in
diff --git a/test/unit/object/inner/parenthesis/selections b/test/normal/object/inner/parenthesis/selections
similarity index 100%
rename from test/unit/object/inner/parenthesis/selections
rename to test/normal/object/inner/parenthesis/selections
diff --git a/test/unit/object/inner/sentence/cmd b/test/normal/object/inner/sentence/cmd
similarity index 100%
rename from test/unit/object/inner/sentence/cmd
rename to test/normal/object/inner/sentence/cmd
diff --git a/test/unit/object/inner/sentence/in b/test/normal/object/inner/sentence/in
similarity index 100%
rename from test/unit/object/inner/sentence/in
rename to test/normal/object/inner/sentence/in
diff --git a/test/unit/object/inner/sentence/selections b/test/normal/object/inner/sentence/selections
similarity index 100%
rename from test/unit/object/inner/sentence/selections
rename to test/normal/object/inner/sentence/selections
diff --git a/test/unit/object/inner/single_quote/cmd b/test/normal/object/inner/single_quote/cmd
similarity index 100%
rename from test/unit/object/inner/single_quote/cmd
rename to test/normal/object/inner/single_quote/cmd
diff --git a/test/unit/object/inner/single_quote/in b/test/normal/object/inner/single_quote/in
similarity index 100%
rename from test/unit/object/inner/single_quote/in
rename to test/normal/object/inner/single_quote/in
diff --git a/test/unit/object/inner/single_quote/selections b/test/normal/object/inner/single_quote/selections
similarity index 100%
rename from test/unit/object/inner/single_quote/selections
rename to test/normal/object/inner/single_quote/selections
diff --git a/test/unit/object/inner/slash/cmd b/test/normal/object/inner/slash/cmd
similarity index 100%
rename from test/unit/object/inner/slash/cmd
rename to test/normal/object/inner/slash/cmd
diff --git a/test/unit/object/inner/slash/in b/test/normal/object/inner/slash/in
similarity index 100%
rename from test/unit/object/inner/slash/in
rename to test/normal/object/inner/slash/in
diff --git a/test/unit/object/inner/slash/selections b/test/normal/object/inner/slash/selections
similarity index 100%
rename from test/unit/object/inner/slash/selections
rename to test/normal/object/inner/slash/selections
diff --git a/test/unit/object/inner/word/cmd b/test/normal/object/inner/word/cmd
similarity index 100%
rename from test/unit/object/inner/word/cmd
rename to test/normal/object/inner/word/cmd
diff --git a/test/unit/object/inner/word/in b/test/normal/object/inner/word/in
similarity index 100%
rename from test/unit/object/inner/word/in
rename to test/normal/object/inner/word/in
diff --git a/test/unit/object/inner/word/selections b/test/normal/object/inner/word/selections
similarity index 100%
rename from test/unit/object/inner/word/selections
rename to test/normal/object/inner/word/selections
diff --git a/test/unit/object/start-extending/angle/cmd b/test/normal/object/start-extending/angle/cmd
similarity index 100%
rename from test/unit/object/start-extending/angle/cmd
rename to test/normal/object/start-extending/angle/cmd
diff --git a/test/unit/object/start-extending/angle/in b/test/normal/object/start-extending/angle/in
similarity index 100%
rename from test/unit/object/start-extending/angle/in
rename to test/normal/object/start-extending/angle/in
diff --git a/test/unit/object/start-extending/angle/selections b/test/normal/object/start-extending/angle/selections
similarity index 100%
rename from test/unit/object/start-extending/angle/selections
rename to test/normal/object/start-extending/angle/selections
diff --git a/test/unit/object/start-extending/argument/cmd b/test/normal/object/start-extending/argument/cmd
similarity index 100%
rename from test/unit/object/start-extending/argument/cmd
rename to test/normal/object/start-extending/argument/cmd
diff --git a/test/unit/object/start-extending/argument/in b/test/normal/object/start-extending/argument/in
similarity index 100%
rename from test/unit/object/start-extending/argument/in
rename to test/normal/object/start-extending/argument/in
diff --git a/test/unit/object/start-extending/argument/selections b/test/normal/object/start-extending/argument/selections
similarity index 100%
rename from test/unit/object/start-extending/argument/selections
rename to test/normal/object/start-extending/argument/selections
diff --git a/test/unit/object/start-extending/big-word/cmd b/test/normal/object/start-extending/big-word/cmd
similarity index 100%
rename from test/unit/object/start-extending/big-word/cmd
rename to test/normal/object/start-extending/big-word/cmd
diff --git a/test/unit/object/start-extending/big-word/in b/test/normal/object/start-extending/big-word/in
similarity index 100%
rename from test/unit/object/start-extending/big-word/in
rename to test/normal/object/start-extending/big-word/in
diff --git a/test/unit/object/start-extending/big-word/selections b/test/normal/object/start-extending/big-word/selections
similarity index 100%
rename from test/unit/object/start-extending/big-word/selections
rename to test/normal/object/start-extending/big-word/selections
diff --git a/test/unit/object/start-extending/braces/cmd b/test/normal/object/start-extending/braces/cmd
similarity index 100%
rename from test/unit/object/start-extending/braces/cmd
rename to test/normal/object/start-extending/braces/cmd
diff --git a/test/unit/object/start-extending/braces/in b/test/normal/object/start-extending/braces/in
similarity index 100%
rename from test/unit/object/start-extending/braces/in
rename to test/normal/object/start-extending/braces/in
diff --git a/test/unit/object/start-extending/braces/selections b/test/normal/object/start-extending/braces/selections
similarity index 100%
rename from test/unit/object/start-extending/braces/selections
rename to test/normal/object/start-extending/braces/selections
diff --git a/test/unit/object/start-extending/brackets/cmd b/test/normal/object/start-extending/brackets/cmd
similarity index 100%
rename from test/unit/object/start-extending/brackets/cmd
rename to test/normal/object/start-extending/brackets/cmd
diff --git a/test/unit/object/start-extending/brackets/in b/test/normal/object/start-extending/brackets/in
similarity index 100%
rename from test/unit/object/start-extending/brackets/in
rename to test/normal/object/start-extending/brackets/in
diff --git a/test/unit/object/start-extending/brackets/selections b/test/normal/object/start-extending/brackets/selections
similarity index 100%
rename from test/unit/object/start-extending/brackets/selections
rename to test/normal/object/start-extending/brackets/selections
diff --git a/test/unit/object/start-extending/double_quote/cmd b/test/normal/object/start-extending/double_quote/cmd
similarity index 100%
rename from test/unit/object/start-extending/double_quote/cmd
rename to test/normal/object/start-extending/double_quote/cmd
diff --git a/test/unit/object/start-extending/double_quote/in b/test/normal/object/start-extending/double_quote/in
similarity index 100%
rename from test/unit/object/start-extending/double_quote/in
rename to test/normal/object/start-extending/double_quote/in
diff --git a/test/unit/object/start-extending/double_quote/selections b/test/normal/object/start-extending/double_quote/selections
similarity index 100%
rename from test/unit/object/start-extending/double_quote/selections
rename to test/normal/object/start-extending/double_quote/selections
diff --git a/test/unit/object/start-extending/grave_quote/cmd b/test/normal/object/start-extending/grave_quote/cmd
similarity index 100%
rename from test/unit/object/start-extending/grave_quote/cmd
rename to test/normal/object/start-extending/grave_quote/cmd
diff --git a/test/unit/object/start-extending/grave_quote/in b/test/normal/object/start-extending/grave_quote/in
similarity index 100%
rename from test/unit/object/start-extending/grave_quote/in
rename to test/normal/object/start-extending/grave_quote/in
diff --git a/test/unit/object/start-extending/grave_quote/selections b/test/normal/object/start-extending/grave_quote/selections
similarity index 100%
rename from test/unit/object/start-extending/grave_quote/selections
rename to test/normal/object/start-extending/grave_quote/selections
diff --git a/test/unit/object/start-extending/indent/cmd b/test/normal/object/start-extending/indent/cmd
similarity index 100%
rename from test/unit/object/start-extending/indent/cmd
rename to test/normal/object/start-extending/indent/cmd
diff --git a/test/unit/object/start-extending/indent/in b/test/normal/object/start-extending/indent/in
similarity index 100%
rename from test/unit/object/start-extending/indent/in
rename to test/normal/object/start-extending/indent/in
diff --git a/test/unit/object/start-extending/indent/selections b/test/normal/object/start-extending/indent/selections
similarity index 100%
rename from test/unit/object/start-extending/indent/selections
rename to test/normal/object/start-extending/indent/selections
diff --git a/test/unit/object/start-extending/paragraph/cmd b/test/normal/object/start-extending/paragraph/cmd
similarity index 100%
rename from test/unit/object/start-extending/paragraph/cmd
rename to test/normal/object/start-extending/paragraph/cmd
diff --git a/test/unit/object/start-extending/paragraph/in b/test/normal/object/start-extending/paragraph/in
similarity index 100%
rename from test/unit/object/start-extending/paragraph/in
rename to test/normal/object/start-extending/paragraph/in
diff --git a/test/unit/object/start-extending/paragraph/selections b/test/normal/object/start-extending/paragraph/selections
similarity index 100%
rename from test/unit/object/start-extending/paragraph/selections
rename to test/normal/object/start-extending/paragraph/selections
diff --git a/test/unit/object/start-extending/parenthesis/cmd b/test/normal/object/start-extending/parenthesis/cmd
similarity index 100%
rename from test/unit/object/start-extending/parenthesis/cmd
rename to test/normal/object/start-extending/parenthesis/cmd
diff --git a/test/unit/object/start-extending/parenthesis/in b/test/normal/object/start-extending/parenthesis/in
similarity index 100%
rename from test/unit/object/start-extending/parenthesis/in
rename to test/normal/object/start-extending/parenthesis/in
diff --git a/test/unit/object/start-extending/parenthesis/selections b/test/normal/object/start-extending/parenthesis/selections
similarity index 100%
rename from test/unit/object/start-extending/parenthesis/selections
rename to test/normal/object/start-extending/parenthesis/selections
diff --git a/test/unit/object/start-extending/sentence/cmd b/test/normal/object/start-extending/sentence/cmd
similarity index 100%
rename from test/unit/object/start-extending/sentence/cmd
rename to test/normal/object/start-extending/sentence/cmd
diff --git a/test/unit/object/start-extending/sentence/in b/test/normal/object/start-extending/sentence/in
similarity index 100%
rename from test/unit/object/start-extending/sentence/in
rename to test/normal/object/start-extending/sentence/in
diff --git a/test/unit/object/start-extending/sentence/selections b/test/normal/object/start-extending/sentence/selections
similarity index 100%
rename from test/unit/object/start-extending/sentence/selections
rename to test/normal/object/start-extending/sentence/selections
diff --git a/test/unit/object/start-extending/single_quote/cmd b/test/normal/object/start-extending/single_quote/cmd
similarity index 100%
rename from test/unit/object/start-extending/single_quote/cmd
rename to test/normal/object/start-extending/single_quote/cmd
diff --git a/test/unit/object/start-extending/single_quote/in b/test/normal/object/start-extending/single_quote/in
similarity index 100%
rename from test/unit/object/start-extending/single_quote/in
rename to test/normal/object/start-extending/single_quote/in
diff --git a/test/unit/object/start-extending/single_quote/selections b/test/normal/object/start-extending/single_quote/selections
similarity index 100%
rename from test/unit/object/start-extending/single_quote/selections
rename to test/normal/object/start-extending/single_quote/selections
diff --git a/test/unit/object/start-extending/word/cmd b/test/normal/object/start-extending/word/cmd
similarity index 100%
rename from test/unit/object/start-extending/word/cmd
rename to test/normal/object/start-extending/word/cmd
diff --git a/test/unit/object/start-extending/word/in b/test/normal/object/start-extending/word/in
similarity index 100%
rename from test/unit/object/start-extending/word/in
rename to test/normal/object/start-extending/word/in
diff --git a/test/unit/object/start-extending/word/selections b/test/normal/object/start-extending/word/selections
similarity index 100%
rename from test/unit/object/start-extending/word/selections
rename to test/normal/object/start-extending/word/selections
diff --git a/test/unit/object/start/angle/cmd b/test/normal/object/start/angle/cmd
similarity index 100%
rename from test/unit/object/start/angle/cmd
rename to test/normal/object/start/angle/cmd
diff --git a/test/unit/object/start/angle/in b/test/normal/object/start/angle/in
similarity index 100%
rename from test/unit/object/start/angle/in
rename to test/normal/object/start/angle/in
diff --git a/test/unit/object/start/angle/selections b/test/normal/object/start/angle/selections
similarity index 100%
rename from test/unit/object/start/angle/selections
rename to test/normal/object/start/angle/selections
diff --git a/test/unit/object/start/argument/cmd b/test/normal/object/start/argument/cmd
similarity index 100%
rename from test/unit/object/start/argument/cmd
rename to test/normal/object/start/argument/cmd
diff --git a/test/unit/object/start/argument/in b/test/normal/object/start/argument/in
similarity index 100%
rename from test/unit/object/start/argument/in
rename to test/normal/object/start/argument/in
diff --git a/test/unit/object/start/argument/selections b/test/normal/object/start/argument/selections
similarity index 100%
rename from test/unit/object/start/argument/selections
rename to test/normal/object/start/argument/selections
diff --git a/test/unit/object/start/big-word/cmd b/test/normal/object/start/big-word/cmd
similarity index 100%
rename from test/unit/object/start/big-word/cmd
rename to test/normal/object/start/big-word/cmd
diff --git a/test/unit/object/start/big-word/in b/test/normal/object/start/big-word/in
similarity index 100%
rename from test/unit/object/start/big-word/in
rename to test/normal/object/start/big-word/in
diff --git a/test/unit/object/start/big-word/selections b/test/normal/object/start/big-word/selections
similarity index 100%
rename from test/unit/object/start/big-word/selections
rename to test/normal/object/start/big-word/selections
diff --git a/test/unit/object/start/braces/cmd b/test/normal/object/start/braces/cmd
similarity index 100%
rename from test/unit/object/start/braces/cmd
rename to test/normal/object/start/braces/cmd
diff --git a/test/unit/object/start/braces/in b/test/normal/object/start/braces/in
similarity index 100%
rename from test/unit/object/start/braces/in
rename to test/normal/object/start/braces/in
diff --git a/test/unit/object/start/braces/selections b/test/normal/object/start/braces/selections
similarity index 100%
rename from test/unit/object/start/braces/selections
rename to test/normal/object/start/braces/selections
diff --git a/test/unit/object/start/brackets/cmd b/test/normal/object/start/brackets/cmd
similarity index 100%
rename from test/unit/object/start/brackets/cmd
rename to test/normal/object/start/brackets/cmd
diff --git a/test/unit/object/start/brackets/in b/test/normal/object/start/brackets/in
similarity index 100%
rename from test/unit/object/start/brackets/in
rename to test/normal/object/start/brackets/in
diff --git a/test/unit/object/start/brackets/selections b/test/normal/object/start/brackets/selections
similarity index 100%
rename from test/unit/object/start/brackets/selections
rename to test/normal/object/start/brackets/selections
diff --git a/test/unit/object/start/double_quote/cmd b/test/normal/object/start/double_quote/cmd
similarity index 100%
rename from test/unit/object/start/double_quote/cmd
rename to test/normal/object/start/double_quote/cmd
diff --git a/test/unit/object/start/double_quote/in b/test/normal/object/start/double_quote/in
similarity index 100%
rename from test/unit/object/start/double_quote/in
rename to test/normal/object/start/double_quote/in
diff --git a/test/unit/object/start/double_quote/selections b/test/normal/object/start/double_quote/selections
similarity index 100%
rename from test/unit/object/start/double_quote/selections
rename to test/normal/object/start/double_quote/selections
diff --git a/test/unit/object/start/grave_quote/cmd b/test/normal/object/start/grave_quote/cmd
similarity index 100%
rename from test/unit/object/start/grave_quote/cmd
rename to test/normal/object/start/grave_quote/cmd
diff --git a/test/unit/object/start/grave_quote/in b/test/normal/object/start/grave_quote/in
similarity index 100%
rename from test/unit/object/start/grave_quote/in
rename to test/normal/object/start/grave_quote/in
diff --git a/test/unit/object/start/grave_quote/selections b/test/normal/object/start/grave_quote/selections
similarity index 100%
rename from test/unit/object/start/grave_quote/selections
rename to test/normal/object/start/grave_quote/selections
diff --git a/test/unit/object/start/indent/cmd b/test/normal/object/start/indent/cmd
similarity index 100%
rename from test/unit/object/start/indent/cmd
rename to test/normal/object/start/indent/cmd
diff --git a/test/unit/object/start/indent/in b/test/normal/object/start/indent/in
similarity index 100%
rename from test/unit/object/start/indent/in
rename to test/normal/object/start/indent/in
diff --git a/test/unit/object/start/indent/selections b/test/normal/object/start/indent/selections
similarity index 100%
rename from test/unit/object/start/indent/selections
rename to test/normal/object/start/indent/selections
diff --git a/test/unit/object/start/paragraph/cmd b/test/normal/object/start/paragraph/cmd
similarity index 100%
rename from test/unit/object/start/paragraph/cmd
rename to test/normal/object/start/paragraph/cmd
diff --git a/test/unit/object/start/paragraph/in b/test/normal/object/start/paragraph/in
similarity index 100%
rename from test/unit/object/start/paragraph/in
rename to test/normal/object/start/paragraph/in
diff --git a/test/unit/object/start/paragraph/selections b/test/normal/object/start/paragraph/selections
similarity index 100%
rename from test/unit/object/start/paragraph/selections
rename to test/normal/object/start/paragraph/selections
diff --git a/test/unit/object/start/parenthesis/cmd b/test/normal/object/start/parenthesis/cmd
similarity index 100%
rename from test/unit/object/start/parenthesis/cmd
rename to test/normal/object/start/parenthesis/cmd
diff --git a/test/unit/object/start/parenthesis/in b/test/normal/object/start/parenthesis/in
similarity index 100%
rename from test/unit/object/start/parenthesis/in
rename to test/normal/object/start/parenthesis/in
diff --git a/test/unit/object/start/parenthesis/selections b/test/normal/object/start/parenthesis/selections
similarity index 100%
rename from test/unit/object/start/parenthesis/selections
rename to test/normal/object/start/parenthesis/selections
diff --git a/test/unit/object/start/sentence/cmd b/test/normal/object/start/sentence/cmd
similarity index 100%
rename from test/unit/object/start/sentence/cmd
rename to test/normal/object/start/sentence/cmd
diff --git a/test/unit/object/start/sentence/in b/test/normal/object/start/sentence/in
similarity index 100%
rename from test/unit/object/start/sentence/in
rename to test/normal/object/start/sentence/in
diff --git a/test/unit/object/start/sentence/selections b/test/normal/object/start/sentence/selections
similarity index 100%
rename from test/unit/object/start/sentence/selections
rename to test/normal/object/start/sentence/selections
diff --git a/test/unit/object/start/single_quote/cmd b/test/normal/object/start/single_quote/cmd
similarity index 100%
rename from test/unit/object/start/single_quote/cmd
rename to test/normal/object/start/single_quote/cmd
diff --git a/test/unit/object/start/single_quote/in b/test/normal/object/start/single_quote/in
similarity index 100%
rename from test/unit/object/start/single_quote/in
rename to test/normal/object/start/single_quote/in
diff --git a/test/unit/object/start/single_quote/selections b/test/normal/object/start/single_quote/selections
similarity index 100%
rename from test/unit/object/start/single_quote/selections
rename to test/normal/object/start/single_quote/selections
diff --git a/test/unit/object/start/word/cmd b/test/normal/object/start/word/cmd
similarity index 100%
rename from test/unit/object/start/word/cmd
rename to test/normal/object/start/word/cmd
diff --git a/test/unit/object/start/word/in b/test/normal/object/start/word/in
similarity index 100%
rename from test/unit/object/start/word/in
rename to test/normal/object/start/word/in
diff --git a/test/unit/object/start/word/selections b/test/normal/object/start/word/selections
similarity index 100%
rename from test/unit/object/start/word/selections
rename to test/normal/object/start/word/selections
diff --git a/test/unit/open-above/cmd b/test/normal/open-above/cmd
similarity index 100%
rename from test/unit/open-above/cmd
rename to test/normal/open-above/cmd
diff --git a/test/unit/open-above/in b/test/normal/open-above/in
similarity index 100%
rename from test/unit/open-above/in
rename to test/normal/open-above/in
diff --git a/test/unit/open-above/out b/test/normal/open-above/out
similarity index 100%
rename from test/unit/open-above/out
rename to test/normal/open-above/out
diff --git a/test/unit/open-below/cmd b/test/normal/open-below/cmd
similarity index 100%
rename from test/unit/open-below/cmd
rename to test/normal/open-below/cmd
diff --git a/test/unit/open-below/in b/test/normal/open-below/in
similarity index 100%
rename from test/unit/open-below/in
rename to test/normal/open-below/in
diff --git a/test/unit/open-below/out b/test/normal/open-below/out
similarity index 100%
rename from test/unit/open-below/out
rename to test/normal/open-below/out
diff --git a/test/unit/paste-after/cmd b/test/normal/paste-after/cmd
similarity index 100%
rename from test/unit/paste-after/cmd
rename to test/normal/paste-after/cmd
diff --git a/test/unit/paste-after/in b/test/normal/paste-after/in
similarity index 100%
rename from test/unit/paste-after/in
rename to test/normal/paste-after/in
diff --git a/test/unit/paste-after/out b/test/normal/paste-after/out
similarity index 100%
rename from test/unit/paste-after/out
rename to test/normal/paste-after/out
diff --git a/test/unit/paste-before/cmd b/test/normal/paste-before/cmd
similarity index 100%
rename from test/unit/paste-before/cmd
rename to test/normal/paste-before/cmd
diff --git a/test/unit/paste-before/in b/test/normal/paste-before/in
similarity index 100%
rename from test/unit/paste-before/in
rename to test/normal/paste-before/in
diff --git a/test/unit/paste-before/out b/test/normal/paste-before/out
similarity index 100%
rename from test/unit/paste-before/out
rename to test/normal/paste-before/out
diff --git a/test/unit/pipe-to/cmd b/test/normal/pipe-to/cmd
similarity index 100%
rename from test/unit/pipe-to/cmd
rename to test/normal/pipe-to/cmd
diff --git a/test/unit/pipe-to/in b/test/normal/pipe-to/in
similarity index 100%
rename from test/unit/pipe-to/in
rename to test/normal/pipe-to/in
diff --git a/test/unit/pipe-to/out b/test/normal/pipe-to/out
similarity index 100%
rename from test/unit/pipe-to/out
rename to test/normal/pipe-to/out
diff --git a/test/unit/pipe/cmd b/test/normal/pipe/cmd
similarity index 100%
rename from test/unit/pipe/cmd
rename to test/normal/pipe/cmd
diff --git a/test/unit/pipe/in b/test/normal/pipe/in
similarity index 100%
rename from test/unit/pipe/in
rename to test/normal/pipe/in
diff --git a/test/unit/pipe/out b/test/normal/pipe/out
similarity index 100%
rename from test/unit/pipe/out
rename to test/normal/pipe/out
diff --git a/test/unit/previous-big-word-extending/cmd b/test/normal/previous-big-word-extending/cmd
similarity index 100%
rename from test/unit/previous-big-word-extending/cmd
rename to test/normal/previous-big-word-extending/cmd
diff --git a/test/unit/previous-big-word-extending/in b/test/normal/previous-big-word-extending/in
similarity index 100%
rename from test/unit/previous-big-word-extending/in
rename to test/normal/previous-big-word-extending/in
diff --git a/test/unit/previous-big-word-extending/selections b/test/normal/previous-big-word-extending/selections
similarity index 100%
rename from test/unit/previous-big-word-extending/selections
rename to test/normal/previous-big-word-extending/selections
diff --git a/test/unit/previous-big-word/cmd b/test/normal/previous-big-word/cmd
similarity index 100%
rename from test/unit/previous-big-word/cmd
rename to test/normal/previous-big-word/cmd
diff --git a/test/unit/previous-big-word/in b/test/normal/previous-big-word/in
similarity index 100%
rename from test/unit/previous-big-word/in
rename to test/normal/previous-big-word/in
diff --git a/test/unit/previous-big-word/selections b/test/normal/previous-big-word/selections
similarity index 100%
rename from test/unit/previous-big-word/selections
rename to test/normal/previous-big-word/selections
diff --git a/test/unit/previous-word-extending/cmd b/test/normal/previous-word-extending/cmd
similarity index 100%
rename from test/unit/previous-word-extending/cmd
rename to test/normal/previous-word-extending/cmd
diff --git a/test/unit/previous-word-extending/in b/test/normal/previous-word-extending/in
similarity index 100%
rename from test/unit/previous-word-extending/in
rename to test/normal/previous-word-extending/in
diff --git a/test/unit/previous-word-extending/selections b/test/normal/previous-word-extending/selections
similarity index 100%
rename from test/unit/previous-word-extending/selections
rename to test/normal/previous-word-extending/selections
diff --git a/test/unit/previous-word/cmd b/test/normal/previous-word/cmd
similarity index 100%
rename from test/unit/previous-word/cmd
rename to test/normal/previous-word/cmd
diff --git a/test/unit/previous-word/in b/test/normal/previous-word/in
similarity index 100%
rename from test/unit/previous-word/in
rename to test/normal/previous-word/in
diff --git a/test/unit/previous-word/selections b/test/normal/previous-word/selections
similarity index 100%
rename from test/unit/previous-word/selections
rename to test/normal/previous-word/selections
diff --git a/test/unit/record-macro/cmd b/test/normal/record-macro/cmd
similarity index 100%
rename from test/unit/record-macro/cmd
rename to test/normal/record-macro/cmd
diff --git a/test/unit/record-macro/out b/test/normal/record-macro/out
similarity index 100%
rename from test/unit/record-macro/out
rename to test/normal/record-macro/out
diff --git a/test/unit/redo/cmd b/test/normal/redo/cmd
similarity index 100%
rename from test/unit/redo/cmd
rename to test/normal/redo/cmd
diff --git a/test/unit/redo/in b/test/normal/redo/in
similarity index 100%
rename from test/unit/redo/in
rename to test/normal/redo/in
diff --git a/test/unit/redo/out b/test/normal/redo/out
similarity index 100%
rename from test/unit/redo/out
rename to test/normal/redo/out
diff --git a/test/unit/reload/cmd b/test/normal/reload/cmd
similarity index 100%
rename from test/unit/reload/cmd
rename to test/normal/reload/cmd
diff --git a/test/unit/reload/in b/test/normal/reload/in
similarity index 100%
rename from test/unit/reload/in
rename to test/normal/reload/in
diff --git a/test/unit/reload/out b/test/normal/reload/out
similarity index 100%
rename from test/unit/reload/out
rename to test/normal/reload/out
diff --git a/test/unit/reload/rc b/test/normal/reload/rc
similarity index 100%
rename from test/unit/reload/rc
rename to test/normal/reload/rc
diff --git a/test/unit/repeat-insert/cmd b/test/normal/repeat-insert/cmd
similarity index 100%
rename from test/unit/repeat-insert/cmd
rename to test/normal/repeat-insert/cmd
diff --git a/test/unit/repeat-insert/out b/test/normal/repeat-insert/out
similarity index 100%
rename from test/unit/repeat-insert/out
rename to test/normal/repeat-insert/out
diff --git a/test/unit/repeat-select/repeat-end-paragraph/cmd b/test/normal/repeat-select/repeat-end-paragraph/cmd
similarity index 100%
rename from test/unit/repeat-select/repeat-end-paragraph/cmd
rename to test/normal/repeat-select/repeat-end-paragraph/cmd
diff --git a/test/unit/repeat-select/repeat-end-paragraph/in b/test/normal/repeat-select/repeat-end-paragraph/in
similarity index 100%
rename from test/unit/repeat-select/repeat-end-paragraph/in
rename to test/normal/repeat-select/repeat-end-paragraph/in
diff --git a/test/unit/repeat-select/repeat-end-paragraph/state b/test/normal/repeat-select/repeat-end-paragraph/state
similarity index 100%
rename from test/unit/repeat-select/repeat-end-paragraph/state
rename to test/normal/repeat-select/repeat-end-paragraph/state
diff --git a/test/unit/repeat-select/repeat-find-char/cmd b/test/normal/repeat-select/repeat-find-char/cmd
similarity index 100%
rename from test/unit/repeat-select/repeat-find-char/cmd
rename to test/normal/repeat-select/repeat-find-char/cmd
diff --git a/test/unit/repeat-select/repeat-find-char/in b/test/normal/repeat-select/repeat-find-char/in
similarity index 100%
rename from test/unit/repeat-select/repeat-find-char/in
rename to test/normal/repeat-select/repeat-find-char/in
diff --git a/test/unit/repeat-select/repeat-find-char/state b/test/normal/repeat-select/repeat-find-char/state
similarity index 100%
rename from test/unit/repeat-select/repeat-find-char/state
rename to test/normal/repeat-select/repeat-find-char/state
diff --git a/test/unit/replace-lines/cmd b/test/normal/replace-lines/cmd
similarity index 100%
rename from test/unit/replace-lines/cmd
rename to test/normal/replace-lines/cmd
diff --git a/test/unit/replace-lines/in b/test/normal/replace-lines/in
similarity index 100%
rename from test/unit/replace-lines/in
rename to test/normal/replace-lines/in
diff --git a/test/unit/replace-lines/out b/test/normal/replace-lines/out
similarity index 100%
rename from test/unit/replace-lines/out
rename to test/normal/replace-lines/out
diff --git a/test/unit/replace/cmd b/test/normal/replace/cmd
similarity index 100%
rename from test/unit/replace/cmd
rename to test/normal/replace/cmd
diff --git a/test/unit/replace/in b/test/normal/replace/in
similarity index 100%
rename from test/unit/replace/in
rename to test/normal/replace/in
diff --git a/test/unit/replace/out b/test/normal/replace/out
similarity index 100%
rename from test/unit/replace/out
rename to test/normal/replace/out
diff --git a/test/unit/replay-macro/cmd b/test/normal/replay-macro/cmd
similarity index 100%
rename from test/unit/replay-macro/cmd
rename to test/normal/replay-macro/cmd
diff --git a/test/unit/replay-macro/out b/test/normal/replay-macro/out
similarity index 100%
rename from test/unit/replay-macro/out
rename to test/normal/replay-macro/out
diff --git a/test/unit/replay-macro/rc b/test/normal/replay-macro/rc
similarity index 100%
rename from test/unit/replay-macro/rc
rename to test/normal/replay-macro/rc
diff --git a/test/unit/rotate-content/cmd b/test/normal/rotate-content/cmd
similarity index 100%
rename from test/unit/rotate-content/cmd
rename to test/normal/rotate-content/cmd
diff --git a/test/unit/rotate-content/in b/test/normal/rotate-content/in
similarity index 100%
rename from test/unit/rotate-content/in
rename to test/normal/rotate-content/in
diff --git a/test/unit/rotate-content/out b/test/normal/rotate-content/out
similarity index 100%
rename from test/unit/rotate-content/out
rename to test/normal/rotate-content/out
diff --git a/test/unit/rotate/cmd b/test/normal/rotate/cmd
similarity index 100%
rename from test/unit/rotate/cmd
rename to test/normal/rotate/cmd
diff --git a/test/unit/rotate/in b/test/normal/rotate/in
similarity index 100%
rename from test/unit/rotate/in
rename to test/normal/rotate/in
diff --git a/test/unit/rotate/selections b/test/normal/rotate/selections
similarity index 100%
rename from test/unit/rotate/selections
rename to test/normal/rotate/selections
diff --git a/test/unit/save-selections/cmd b/test/normal/save-selections/cmd
similarity index 100%
rename from test/unit/save-selections/cmd
rename to test/normal/save-selections/cmd
diff --git a/test/unit/save-selections/in b/test/normal/save-selections/in
similarity index 100%
rename from test/unit/save-selections/in
rename to test/normal/save-selections/in
diff --git a/test/unit/save-selections/selections b/test/normal/save-selections/selections
similarity index 100%
rename from test/unit/save-selections/selections
rename to test/normal/save-selections/selections
diff --git a/test/unit/search-extending/cmd b/test/normal/search-extending/cmd
similarity index 100%
rename from test/unit/search-extending/cmd
rename to test/normal/search-extending/cmd
diff --git a/test/unit/search-extending/in b/test/normal/search-extending/in
similarity index 100%
rename from test/unit/search-extending/in
rename to test/normal/search-extending/in
diff --git a/test/unit/search-extending/selections b/test/normal/search-extending/selections
similarity index 100%
rename from test/unit/search-extending/selections
rename to test/normal/search-extending/selections
diff --git a/test/unit/search-reverse-extending/cmd b/test/normal/search-reverse-extending/cmd
similarity index 100%
rename from test/unit/search-reverse-extending/cmd
rename to test/normal/search-reverse-extending/cmd
diff --git a/test/unit/search-reverse-extending/in b/test/normal/search-reverse-extending/in
similarity index 100%
rename from test/unit/search-reverse-extending/in
rename to test/normal/search-reverse-extending/in
diff --git a/test/unit/search-reverse-extending/selections b/test/normal/search-reverse-extending/selections
similarity index 100%
rename from test/unit/search-reverse-extending/selections
rename to test/normal/search-reverse-extending/selections
diff --git a/test/unit/search-reverse-rightmost/missed-match/cmd b/test/normal/search-reverse-rightmost/missed-match/cmd
similarity index 100%
rename from test/unit/search-reverse-rightmost/missed-match/cmd
rename to test/normal/search-reverse-rightmost/missed-match/cmd
diff --git a/test/unit/search-reverse-rightmost/missed-match/in b/test/normal/search-reverse-rightmost/missed-match/in
similarity index 100%
rename from test/unit/search-reverse-rightmost/missed-match/in
rename to test/normal/search-reverse-rightmost/missed-match/in
diff --git a/test/unit/search-reverse-rightmost/missed-match/selections b/test/normal/search-reverse-rightmost/missed-match/selections
similarity index 100%
rename from test/unit/search-reverse-rightmost/missed-match/selections
rename to test/normal/search-reverse-rightmost/missed-match/selections
diff --git a/test/unit/search-reverse-rightmost/overlap/cmd b/test/normal/search-reverse-rightmost/overlap/cmd
similarity index 100%
rename from test/unit/search-reverse-rightmost/overlap/cmd
rename to test/normal/search-reverse-rightmost/overlap/cmd
diff --git a/test/unit/search-reverse-rightmost/overlap/in b/test/normal/search-reverse-rightmost/overlap/in
similarity index 100%
rename from test/unit/search-reverse-rightmost/overlap/in
rename to test/normal/search-reverse-rightmost/overlap/in
diff --git a/test/unit/search-reverse-rightmost/overlap/selections b/test/normal/search-reverse-rightmost/overlap/selections
similarity index 100%
rename from test/unit/search-reverse-rightmost/overlap/selections
rename to test/normal/search-reverse-rightmost/overlap/selections
diff --git a/test/unit/search-reverse/cmd b/test/normal/search-reverse/cmd
similarity index 100%
rename from test/unit/search-reverse/cmd
rename to test/normal/search-reverse/cmd
diff --git a/test/unit/search-reverse/in b/test/normal/search-reverse/in
similarity index 100%
rename from test/unit/search-reverse/in
rename to test/normal/search-reverse/in
diff --git a/test/unit/search-reverse/selections b/test/normal/search-reverse/selections
similarity index 100%
rename from test/unit/search-reverse/selections
rename to test/normal/search-reverse/selections
diff --git a/test/unit/search/cmd b/test/normal/search/cmd
similarity index 100%
rename from test/unit/search/cmd
rename to test/normal/search/cmd
diff --git a/test/unit/search/in b/test/normal/search/in
similarity index 100%
rename from test/unit/search/in
rename to test/normal/search/in
diff --git a/test/unit/search/selections b/test/normal/search/selections
similarity index 100%
rename from test/unit/search/selections
rename to test/normal/search/selections
diff --git a/test/unit/select-line-extending/cmd b/test/normal/select-line-extending/cmd
similarity index 100%
rename from test/unit/select-line-extending/cmd
rename to test/normal/select-line-extending/cmd
diff --git a/test/unit/select-line-extending/in b/test/normal/select-line-extending/in
similarity index 100%
rename from test/unit/select-line-extending/in
rename to test/normal/select-line-extending/in
diff --git a/test/unit/select-line-extending/selections b/test/normal/select-line-extending/selections
similarity index 100%
rename from test/unit/select-line-extending/selections
rename to test/normal/select-line-extending/selections
diff --git a/test/unit/select-line/cmd b/test/normal/select-line/cmd
similarity index 100%
rename from test/unit/select-line/cmd
rename to test/normal/select-line/cmd
diff --git a/test/unit/select-line/in b/test/normal/select-line/in
similarity index 100%
rename from test/unit/select-line/in
rename to test/normal/select-line/in
diff --git a/test/unit/select-line/selections b/test/normal/select-line/selections
similarity index 100%
rename from test/unit/select-line/selections
rename to test/normal/select-line/selections
diff --git a/test/unit/select/cmd b/test/normal/select/cmd
similarity index 100%
rename from test/unit/select/cmd
rename to test/normal/select/cmd
diff --git a/test/unit/select/in b/test/normal/select/in
similarity index 100%
rename from test/unit/select/in
rename to test/normal/select/in
diff --git a/test/unit/select/selections b/test/normal/select/selections
similarity index 100%
rename from test/unit/select/selections
rename to test/normal/select/selections
diff --git a/test/unit/split-at-begin/cmd b/test/normal/split-at-begin/cmd
similarity index 100%
rename from test/unit/split-at-begin/cmd
rename to test/normal/split-at-begin/cmd
diff --git a/test/unit/split-at-begin/in b/test/normal/split-at-begin/in
similarity index 100%
rename from test/unit/split-at-begin/in
rename to test/normal/split-at-begin/in
diff --git a/test/unit/split-at-begin/selections b/test/normal/split-at-begin/selections
similarity index 100%
rename from test/unit/split-at-begin/selections
rename to test/normal/split-at-begin/selections
diff --git a/test/unit/split/cmd b/test/normal/split/cmd
similarity index 100%
rename from test/unit/split/cmd
rename to test/normal/split/cmd
diff --git a/test/unit/split/in b/test/normal/split/in
similarity index 100%
rename from test/unit/split/in
rename to test/normal/split/in
diff --git a/test/unit/split/selections b/test/normal/split/selections
similarity index 100%
rename from test/unit/split/selections
rename to test/normal/split/selections
diff --git a/test/unit/switch-case/cmd b/test/normal/switch-case/cmd
similarity index 100%
rename from test/unit/switch-case/cmd
rename to test/normal/switch-case/cmd
diff --git a/test/unit/switch-case/in b/test/normal/switch-case/in
similarity index 100%
rename from test/unit/switch-case/in
rename to test/normal/switch-case/in
diff --git a/test/unit/switch-case/selections b/test/normal/switch-case/selections
similarity index 100%
rename from test/unit/switch-case/selections
rename to test/normal/switch-case/selections
diff --git a/test/unit/to-char-backward-extending/cmd b/test/normal/to-char-backward-extending/cmd
similarity index 100%
rename from test/unit/to-char-backward-extending/cmd
rename to test/normal/to-char-backward-extending/cmd
diff --git a/test/unit/to-char-backward-extending/in b/test/normal/to-char-backward-extending/in
similarity index 100%
rename from test/unit/to-char-backward-extending/in
rename to test/normal/to-char-backward-extending/in
diff --git a/test/unit/to-char-backward-extending/selections b/test/normal/to-char-backward-extending/selections
similarity index 100%
rename from test/unit/to-char-backward-extending/selections
rename to test/normal/to-char-backward-extending/selections
diff --git a/test/unit/to-char-backward/cmd b/test/normal/to-char-backward/cmd
similarity index 100%
rename from test/unit/to-char-backward/cmd
rename to test/normal/to-char-backward/cmd
diff --git a/test/unit/to-char-backward/in b/test/normal/to-char-backward/in
similarity index 100%
rename from test/unit/to-char-backward/in
rename to test/normal/to-char-backward/in
diff --git a/test/unit/to-char-backward/selections b/test/normal/to-char-backward/selections
similarity index 100%
rename from test/unit/to-char-backward/selections
rename to test/normal/to-char-backward/selections
diff --git a/test/unit/to-char-forward-extending/cmd b/test/normal/to-char-forward-extending/cmd
similarity index 100%
rename from test/unit/to-char-forward-extending/cmd
rename to test/normal/to-char-forward-extending/cmd
diff --git a/test/unit/to-char-forward-extending/in b/test/normal/to-char-forward-extending/in
similarity index 100%
rename from test/unit/to-char-forward-extending/in
rename to test/normal/to-char-forward-extending/in
diff --git a/test/unit/to-char-forward-extending/selections b/test/normal/to-char-forward-extending/selections
similarity index 100%
rename from test/unit/to-char-forward-extending/selections
rename to test/normal/to-char-forward-extending/selections
diff --git a/test/unit/to-char-forward/cmd b/test/normal/to-char-forward/cmd
similarity index 100%
rename from test/unit/to-char-forward/cmd
rename to test/normal/to-char-forward/cmd
diff --git a/test/unit/to-char-forward/in b/test/normal/to-char-forward/in
similarity index 100%
rename from test/unit/to-char-forward/in
rename to test/normal/to-char-forward/in
diff --git a/test/unit/to-char-forward/selections b/test/normal/to-char-forward/selections
similarity index 100%
rename from test/unit/to-char-forward/selections
rename to test/normal/to-char-forward/selections
diff --git a/test/unit/trim-lines/cmd b/test/normal/trim-lines/cmd
similarity index 100%
rename from test/unit/trim-lines/cmd
rename to test/normal/trim-lines/cmd
diff --git a/test/unit/trim-lines/in b/test/normal/trim-lines/in
similarity index 100%
rename from test/unit/trim-lines/in
rename to test/normal/trim-lines/in
diff --git a/test/unit/trim-lines/selections b/test/normal/trim-lines/selections
similarity index 100%
rename from test/unit/trim-lines/selections
rename to test/normal/trim-lines/selections
diff --git a/test/unit/undo-after-replace-lines/cmd b/test/normal/undo-after-replace-lines/cmd
similarity index 100%
rename from test/unit/undo-after-replace-lines/cmd
rename to test/normal/undo-after-replace-lines/cmd
diff --git a/test/unit/undo-after-replace-lines/in b/test/normal/undo-after-replace-lines/in
similarity index 100%
rename from test/unit/undo-after-replace-lines/in
rename to test/normal/undo-after-replace-lines/in
diff --git a/test/unit/undo-after-replace-lines/out b/test/normal/undo-after-replace-lines/out
similarity index 100%
rename from test/unit/undo-after-replace-lines/out
rename to test/normal/undo-after-replace-lines/out
diff --git a/test/unit/undo/cmd b/test/normal/undo/cmd
similarity index 100%
rename from test/unit/undo/cmd
rename to test/normal/undo/cmd
diff --git a/test/unit/undo/in b/test/normal/undo/in
similarity index 100%
rename from test/unit/undo/in
rename to test/normal/undo/in
diff --git a/test/unit/undo/out b/test/normal/undo/out
similarity index 100%
rename from test/unit/undo/out
rename to test/normal/undo/out
diff --git a/test/unit/upper-case/cmd b/test/normal/upper-case/cmd
similarity index 100%
rename from test/unit/upper-case/cmd
rename to test/normal/upper-case/cmd
diff --git a/test/unit/upper-case/in b/test/normal/upper-case/in
similarity index 100%
rename from test/unit/upper-case/in
rename to test/normal/upper-case/in
diff --git a/test/unit/upper-case/selections b/test/normal/upper-case/selections
similarity index 100%
rename from test/unit/upper-case/selections
rename to test/normal/upper-case/selections
diff --git a/test/unit/yank/cmd b/test/normal/yank/cmd
similarity index 100%
rename from test/unit/yank/cmd
rename to test/normal/yank/cmd
diff --git a/test/unit/yank/in b/test/normal/yank/in
similarity index 100%
rename from test/unit/yank/in
rename to test/normal/yank/in
diff --git a/test/unit/yank/out b/test/normal/yank/out
similarity index 100%
rename from test/unit/yank/out
rename to test/normal/yank/out