From 5339de3919cf772284b8f0f9cdf8502535156b7a Mon Sep 17 00:00:00 2001
From: Hannes Laimer <hannes.laimer@tuwien.ac.at>
Date: Fri, 21 Apr 2023 17:34:44 +0200
Subject: [PATCH] update tests/docs to work with disabled cascading writes
 #3742

---
 doc/help/kdb-editor.md                          |  4 +++-
 doc/help/kdb-find.md                            |  2 +-
 doc/help/kdb-ls.md                              |  2 +-
 doc/help/kdb-mv.md                              |  2 ++
 doc/help/kdb-rm.md                              |  2 ++
 doc/man/man1/kdb-editor.1                       |  7 +++++--
 doc/man/man1/kdb-find.1                         |  4 ++--
 doc/man/man1/kdb-ls.1                           |  4 ++--
 doc/man/man1/kdb-mv.1                           |  5 ++++-
 doc/man/man1/kdb-rm.1                           |  5 ++++-
 doc/tutorials/cascading.md                      |  7 ++++---
 doc/tutorials/cmerge.md                         |  2 ++
 doc/tutorials/merge.md                          |  2 ++
 doc/tutorials/namespaces.md                     |  5 +++++
 doc/tutorials/validation.md                     | 17 +++++++++++------
 src/bindings/gsettings/README.md                |  2 +-
 src/plugins/conditionals/README.md              |  3 ++-
 src/plugins/csvstorage/README.md                |  4 ++--
 src/plugins/email/README.md                     |  3 ++-
 src/plugins/fcrypt/README.md                    |  3 +--
 src/plugins/hosts/README.md                     |  6 +++---
 src/plugins/ipaddr/README.md                    |  3 ++-
 src/plugins/kconfig/README.md                   |  2 +-
 src/plugins/length/README.md                    |  3 ++-
 src/plugins/path/README.md                      |  4 ++--
 src/plugins/range/README.md                     |  3 ++-
 src/plugins/shell/README.md                     |  1 +
 src/plugins/spec/README.md                      |  8 ++++----
 src/plugins/xfconf/README.md                    |  2 +-
 src/plugins/yamlcpp/README.md                   |  3 ++-
 src/tools/kdb/mount.cpp                         |  2 +-
 tests/shell/check_distribution.sh               |  4 ++--
 tests/shell/check_gen.sh                        |  3 ++-
 .../shell_recorder/tutorial_wrapper/README.md   |  2 +-
 34 files changed, 84 insertions(+), 47 deletions(-)

diff --git a/doc/help/kdb-editor.md b/doc/help/kdb-editor.md
index a12a50297e3..64c2d42a312 100644
--- a/doc/help/kdb-editor.md
+++ b/doc/help/kdb-editor.md
@@ -25,12 +25,14 @@ The user should specify the format that the current configuration or keys are in
 - 11:
   could not export configuration.
 - 12:
-  could not start editor.
+  No namespace specified.
 - 13:
   could not import configuration because of conflicts
 - 14:
   could not import configuration because of error during kdbSet()
   (Most likely a validation error)
+- 15:
+  could not start editor.
 
 ## OPTIONS
 
diff --git a/doc/help/kdb-find.md b/doc/help/kdb-find.md
index 306a4012ebe..4f41457f33e 100644
--- a/doc/help/kdb-find.md
+++ b/doc/help/kdb-find.md
@@ -56,7 +56,7 @@ kdb find 'fizz'
 #> user:/tests/find/tests/fizz/buzz
 #> user:/tests/find/tostfizz
 
-kdb rm -r /tests/find
+kdb rm -r user:/tests/find
 sudo kdb umount user:/tests/find
 ```
 
diff --git a/doc/help/kdb-ls.md b/doc/help/kdb-ls.md
index 113c21af49c..73c1fdc9d8d 100644
--- a/doc/help/kdb-ls.md
+++ b/doc/help/kdb-ls.md
@@ -90,7 +90,7 @@ kdb ls /tests/examples/kdb-ls/ -v
 #> user:/tests/examples/kdb-ls/tost
 #> user:/tests/examples/kdb-ls/tost/level
 
-kdb rm -r user:/tests/examples
+kdb rm -r user:/tests/examples/
 sudo kdb umount user:/tests/examples
 ```
 
diff --git a/doc/help/kdb-mv.md b/doc/help/kdb-mv.md
index c368f02d7ec..e7360d47763 100644
--- a/doc/help/kdb-mv.md
+++ b/doc/help/kdb-mv.md
@@ -28,6 +28,8 @@ This command will return the following values as an exit status:
   standard exit codes, see [kdb(1)](kdb.md)
 - 11:
   No key to move found.
+- 12:
+  No namespace specified.
 
 ## OPTIONS
 
diff --git a/doc/help/kdb-rm.md b/doc/help/kdb-rm.md
index b5b70eb4f3b..df280e87397 100644
--- a/doc/help/kdb-rm.md
+++ b/doc/help/kdb-rm.md
@@ -21,6 +21,8 @@ This command will return the following values as an exit status:
   standard exit codes, see [kdb(1)](kdb.md)
 - 11:
   No key to remove found.
+- 12:
+  No namespace specified.
 
 ## OPTIONS
 
diff --git a/doc/man/man1/kdb-editor.1 b/doc/man/man1/kdb-editor.1
index 7ba5e813421..0ed98a9c98c 100644
--- a/doc/man/man1/kdb-editor.1
+++ b/doc/man/man1/kdb-editor.1
@@ -1,6 +1,6 @@
 .\" generated with Ronn-NG/v0.10.1
 .\" http://github.com/apjanke/ronn-ng/tree/0.10.1.pre3
-.TH "KDB\-EDITOR" "1" "August 2021" ""
+.TH "KDB\-EDITOR" "1" "April 2023" ""
 .SH "NAME"
 \fBkdb\-editor\fR \- Use your editor for editing KDB
 .SH "SYNOPSIS"
@@ -21,13 +21,16 @@ standard exit codes, see kdb(1) \fIkdb\.md\fR
 could not export configuration\.
 .TP
 12
-could not start editor\.
+No namespace specified\.
 .TP
 13
 could not import configuration because of conflicts
 .TP
 14
 could not import configuration because of error during kdbSet() (Most likely a validation error)
+.TP
+15
+could not start editor\.
 .SH "OPTIONS"
 .TP
 \fB\-H\fR, \fB\-\-help\fR
diff --git a/doc/man/man1/kdb-find.1 b/doc/man/man1/kdb-find.1
index c59772e0113..4d626a0e127 100644
--- a/doc/man/man1/kdb-find.1
+++ b/doc/man/man1/kdb-find.1
@@ -1,6 +1,6 @@
 .\" generated with Ronn-NG/v0.10.1
 .\" http://github.com/apjanke/ronn-ng/tree/0.10.1.pre3
-.TH "KDB\-FIND" "1" "November 2020" ""
+.TH "KDB\-FIND" "1" "April 2023" ""
 .SH "NAME"
 \fBkdb\-find\fR \- Find keys in the key database
 .SH "SYNOPSIS"
@@ -59,7 +59,7 @@ kdb find 'fizz'
 #> user:/tests/find/tests/fizz/buzz
 #> user:/tests/find/tostfizz
 
-kdb rm \-r /tests/find
+kdb rm \-r user:/tests/find
 sudo kdb umount user:/tests/find
 .fi
 .SH "SEE ALSO"
diff --git a/doc/man/man1/kdb-ls.1 b/doc/man/man1/kdb-ls.1
index c4a0628cbdf..f01f6588d82 100644
--- a/doc/man/man1/kdb-ls.1
+++ b/doc/man/man1/kdb-ls.1
@@ -1,6 +1,6 @@
 .\" generated with Ronn-NG/v0.10.1
 .\" http://github.com/apjanke/ronn-ng/tree/0.10.1.pre3
-.TH "KDB\-LS" "1" "November 2020" ""
+.TH "KDB\-LS" "1" "April 2023" ""
 .SH "NAME"
 \fBkdb\-ls\fR \- List keys in the key database
 .SH "SYNOPSIS"
@@ -93,7 +93,7 @@ kdb ls /tests/examples/kdb\-ls/ \-v
 #> user:/tests/examples/kdb\-ls/tost
 #> user:/tests/examples/kdb\-ls/tost/level
 
-kdb rm \-r user:/tests/examples
+kdb rm \-r user:/tests/examples/
 sudo kdb umount user:/tests/examples
 .fi
 .SH "SEE ALSO"
diff --git a/doc/man/man1/kdb-mv.1 b/doc/man/man1/kdb-mv.1
index 6a1cc555ac9..a30728746ec 100644
--- a/doc/man/man1/kdb-mv.1
+++ b/doc/man/man1/kdb-mv.1
@@ -1,6 +1,6 @@
 .\" generated with Ronn-NG/v0.10.1
 .\" http://github.com/apjanke/ronn-ng/tree/0.10.1.pre3
-.TH "KDB\-MV" "1" "November 2020" ""
+.TH "KDB\-MV" "1" "April 2023" ""
 .SH "NAME"
 \fBkdb\-mv\fR \- Move keys within the key database
 .SH "SYNOPSIS"
@@ -22,6 +22,9 @@ standard exit codes, see kdb(1) \fIkdb\.md\fR
 .TP
 11
 No key to move found\.
+.TP
+12
+No namespace specified\.
 .SH "OPTIONS"
 .TP
 \fB\-H\fR, \fB\-\-help\fR
diff --git a/doc/man/man1/kdb-rm.1 b/doc/man/man1/kdb-rm.1
index 1e5583e0281..9c74b2cd4c9 100644
--- a/doc/man/man1/kdb-rm.1
+++ b/doc/man/man1/kdb-rm.1
@@ -1,6 +1,6 @@
 .\" generated with Ronn-NG/v0.10.1
 .\" http://github.com/apjanke/ronn-ng/tree/0.10.1.pre3
-.TH "KDB\-RM" "1" "November 2020" ""
+.TH "KDB\-RM" "1" "April 2023" ""
 .SH "NAME"
 \fBkdb\-rm\fR \- Remove key(s) from the key database
 .SH "SYNOPSIS"
@@ -20,6 +20,9 @@ standard exit codes, see kdb(1) \fIkdb\.md\fR
 .TP
 11
 No key to remove found\.
+.TP
+12
+No namespace specified\.
 .SH "OPTIONS"
 .TP
 \fB\-H\fR, \fB\-\-help\fR
diff --git a/doc/tutorials/cascading.md b/doc/tutorials/cascading.md
index 5b23106b61c..8bd9a806a62 100644
--- a/doc/tutorials/cascading.md
+++ b/doc/tutorials/cascading.md
@@ -191,11 +191,12 @@ As last part in this tutorial we remove the modifications to the database we mad
 
 ```sh
 kdb rm -r user:/tests/tutorial/
-sudo kdb rm -r system:/tests/tutorial
-sudo kdb rm -r system:/tests/overrides
+kdb rm -r dir:/tests/tutorial/
+sudo kdb rm -r system:/tests/tutorial/
+sudo kdb rm -r system:/tests/overrides/
 kdb import system:/tests/overrides dump < $(kdb get user:/tests/overrides)
 rm $(kdb get user:/tests/overrides)
-kdb rm user:/tests/overrides
+kdb rm -r user:/tests/overrides/
 
 sudo kdb rm -r spec:/tests/tutorial/
 
diff --git a/doc/tutorials/cmerge.md b/doc/tutorials/cmerge.md
index 872c69a80d7..d3a2a2a0134 100644
--- a/doc/tutorials/cmerge.md
+++ b/doc/tutorials/cmerge.md
@@ -207,6 +207,8 @@ kdb cmerge -f user:/tests/arrays/changed user:/tests/arrays/original user:/tests
 
 kdb get user:/tests/arrays/result/#0
 #> previous
+
+kdb rm -r user:/tests/
 ```
 
 ## Scripts
diff --git a/doc/tutorials/merge.md b/doc/tutorials/merge.md
index 80d9aac5334..1c078e536de 100644
--- a/doc/tutorials/merge.md
+++ b/doc/tutorials/merge.md
@@ -273,6 +273,8 @@ kdb get user:/tests/result/key4
 
 kdb get user:/tests/result/key5
 #> 5
+
+kdb rm -r user:/tests/
 ```
 
 Here the state of theirs is simply copied to the `resultpath`.
diff --git a/doc/tutorials/namespaces.md b/doc/tutorials/namespaces.md
index 879f1756239..88cfb0b5d0f 100644
--- a/doc/tutorials/namespaces.md
+++ b/doc/tutorials/namespaces.md
@@ -186,3 +186,8 @@ kdb get "/sw/elektra/kdb/#0/debug/verbose"
 ```
 
 Now `kdb get -p debug /some/key` is not verbose anymore for this user.
+
+```sh
+# Cleanup`
+kdb rm -r user:/tests/
+```
diff --git a/doc/tutorials/validation.md b/doc/tutorials/validation.md
index 86f67523dfd..13a17d8be44 100644
--- a/doc/tutorials/validation.md
+++ b/doc/tutorials/validation.md
@@ -259,7 +259,7 @@ kdb file dir:/tests/tutorial
 If you want to go without validation, you can work around that by setting the keys with the `-f` (`--force`) option:
 
 ```sh
-kdb set -f system:/tests/tutorial/links/elektra "invalid url"
+sudo kdb set -f system:/tests/tutorial/links/elektra "invalid url"
 #> Create a new key system:/tests/tutorial/links/elektra with string "invalid url"
 ```
 
@@ -288,7 +288,7 @@ Before we look further let us undo the modifications to the key database.
 
 ```sh
 kdb rm -r spec:/tests/tutorial
-kdb rm -r system:/tests/tutorial
+sudo kdb rm -r system:/tests/tutorial
 kdb rm -rf user:/tests/tutorial
 kdb umount spec:/tests/tutorial
 kdb umount /tests/tutorial
@@ -298,8 +298,8 @@ kdb import spec:/ dump < $(kdb get system:/tests/specbackup)
 kdb import user:/ dump < $(kdb get system:/tests/userbackup)
 rm $(kdb get system:/tests/specbackup)
 rm $(kdb get system:/tests/userbackup)
-kdb rm system:/tests/specbackup
-kdb rm system:/tests/userbackup
+sudo kdb rm system:/tests/specbackup
+sudo kdb rm system:/tests/userbackup
 ```
 
 ## Validate Existing Keys
@@ -315,8 +315,12 @@ sudo kdb mount range.ecf /tests/range range dump
 # set value
 kdb set user:/tests/range/value 5
 
+# set value
+kdb get user:/tests/range/value
+#> 5
+
 # add range check to all keys under /tests/range/
-kdb meta-set spec:/tests/range/_ check/range "1-10"
+sudo kdb meta-set spec:/tests/range/_ check/range "1-10"
 
 # check if validate passes
 kdb validate /tests/range
@@ -329,7 +333,8 @@ kdb validate /tests/range
 # RET:11
 
 # clean up
-kdb rm -r /tests/range/
 sudo kdb umount /tests/range
+kdb rm -rf user:/tests/
+sudo kdb rm -rf spec:/tests/
 
 ```
diff --git a/src/bindings/gsettings/README.md b/src/bindings/gsettings/README.md
index d00ab3dbb78..b0eb76dd416 100644
--- a/src/bindings/gsettings/README.md
+++ b/src/bindings/gsettings/README.md
@@ -108,7 +108,7 @@ export current settings and delete them so they will not be hidden
 
 ```sh
 kdb export /sw dump > tmp
-kdb rm -r /sw
+kdb rm -r user:/sw
 ```
 
 mount sw at you preferred location
diff --git a/src/plugins/conditionals/README.md b/src/plugins/conditionals/README.md
index 0576359e995..64ecab86fcf 100644
--- a/src/plugins/conditionals/README.md
+++ b/src/plugins/conditionals/README.md
@@ -142,7 +142,8 @@ kdb set system:/tests/conditionals/sub/key true
 kdb export system:/tests/conditionals ni
 
 # cleanup
-kdb rm -r /tests/conditionals
+kdb rm -r user:/tests/conditionals
+kdb rm -r system:/tests/conditionals
 sudo kdb umount /tests/conditionals/sub
 sudo kdb umount /tests/conditionals
 
diff --git a/src/plugins/csvstorage/README.md b/src/plugins/csvstorage/README.md
index a5a55fd065d..2d15cddc2e5 100644
--- a/src/plugins/csvstorage/README.md
+++ b/src/plugins/csvstorage/README.md
@@ -149,7 +149,7 @@ kdb ls /tests/csv
 kdb get /tests/csv/tt0108052/Title
 #> Schindler´s List
 
-kdb rm -r /tests/csv
+kdb rm -r user:/tests/csv
 sudo kdb umount /tests/csv
 
 ```
@@ -175,7 +175,7 @@ kdb export /tests/csv csvstorage -c "delimiter=;,header=colname,columns/index=IM
 #> tt0110413;1994
 
 
-kdb rm -r /tests/csv
+kdb rm -r user:/tests/csv
 sudo kdb umount /tests/csv
 
 ```
diff --git a/src/plugins/email/README.md b/src/plugins/email/README.md
index dbf30c88823..9c7662cc01f 100644
--- a/src/plugins/email/README.md
+++ b/src/plugins/email/README.md
@@ -56,7 +56,8 @@ kdb set user:/tests/email/adr @
 # RET: 5
 
 # Undo modifications to the database
-kdb rm -rf /tests/email
+kdb rm -rf spec:/tests/email
+kdb rm -rf user:/tests/email
 kdb umount /tests/email
 ```
 
diff --git a/src/plugins/fcrypt/README.md b/src/plugins/fcrypt/README.md
index 294f783941b..465a5ed6ed3 100644
--- a/src/plugins/fcrypt/README.md
+++ b/src/plugins/fcrypt/README.md
@@ -59,7 +59,6 @@ Please report the issue at https://issues.libelektra.org/
 you might want to consider disabling the sync plugin by entering:
 
 ```sh
-kdb set /sw/elektra/kdb/#0/current/plugins ""
 kdb set system:/sw/elektra/kdb/#0/current/plugins ""
 ```
 
@@ -103,7 +102,7 @@ kdb mount test.ecf /t fcrypt \
 If you create a key under `/t`
 
 ```sh
-kdb set /t/a "hello world"
+kdb set user:/t/a "hello world"
 ```
 
 you will notice that you can not read the plain text of `test.ecf` because it has been encrypted by GPG.
diff --git a/src/plugins/hosts/README.md b/src/plugins/hosts/README.md
index ddff8b67381..708e32369e7 100644
--- a/src/plugins/hosts/README.md
+++ b/src/plugins/hosts/README.md
@@ -98,15 +98,15 @@ kdb get /tests/hosts/ipv6/localhost
 #> ::1
 
 # Should both fail with error C03200 and return 5
-kdb set /tests/hosts/ipv4/localhost ::1
+kdb set user:/tests/hosts/ipv4/localhost ::1
 # RET:5
 # ERROR:C03200
-kdb set /tests/hosts/ipv6/localhost 127.0.0.1
+kdb set user:/tests/hosts/ipv6/localhost 127.0.0.1
 # RET:5
 # ERROR:C03200
 
 # cleanup
-kdb rm -r /tests/hosts
+kdb rm -r user:/tests/hosts
 sudo kdb umount /tests/hosts
 ```
 
diff --git a/src/plugins/ipaddr/README.md b/src/plugins/ipaddr/README.md
index 0fac98a2d59..d8460b54dde 100644
--- a/src/plugins/ipaddr/README.md
+++ b/src/plugins/ipaddr/README.md
@@ -54,7 +54,8 @@ kdb set system:/tests/ipaddr/address 1.2.-3.4
 # RET: 5
 
 # Undo modifications to the database
-kdb rm -r /tests/ipaddr
+kdb rm -r system:/tests/ipaddr
+kdb rm -r spec:/tests/ipaddr
 kdb umount /tests/ipaddr
 ```
 
diff --git a/src/plugins/kconfig/README.md b/src/plugins/kconfig/README.md
index ae61c02e7cb..bb71e6c6a78 100644
--- a/src/plugins/kconfig/README.md
+++ b/src/plugins/kconfig/README.md
@@ -75,7 +75,7 @@ kdb get /tests/kconfig/key
 #> Value
 
 # Set the value to Example
-kdb set /tests/kconfig/key Example
+kdb set user:/tests/kconfig/key Example
 
 # Verify that the value has changed in the file too
 cat `kdb file user:/tests/kconfig`
diff --git a/src/plugins/length/README.md b/src/plugins/length/README.md
index 32edd6efc82..ee1ec07d78c 100644
--- a/src/plugins/length/README.md
+++ b/src/plugins/length/README.md
@@ -41,7 +41,8 @@ kdb set user:/tests/length/text abc
 kdb get user:/tests/length/text
 
 # Undo modifications to the database
-kdb rm -rf /tests/length
+kdb rm -rf spec:/tests/length
+kdb rm -rf user:/tests/length
 kdb umount /tests/length
 ```
 
diff --git a/src/plugins/path/README.md b/src/plugins/path/README.md
index 1641f8d0bba..0294a3bb800 100644
--- a/src/plugins/path/README.md
+++ b/src/plugins/path/README.md
@@ -76,7 +76,7 @@ kdb set user:/tests/path "$HOME"
 # STDOUT-REGEX: .*Set string to "/.*".*
 
 #cleanup
-sudo kdb rm -r user:/tests
+sudo kdb rm -r user:/tests/
 sudo kdb umount user:/tests
 ```
 
@@ -102,7 +102,7 @@ kdb set user:/tests/path `kdb get user:/tests/path/tempfile`
 
 #cleanup
 sudo rm -rf `kdb get user:/tests/path/tempfile`
-sudo kdb rm -r user:/tests
+sudo kdb rm -r user:/tests/
 sudo kdb umount user:/tests
 ```
 
diff --git a/src/plugins/range/README.md b/src/plugins/range/README.md
index e114bc85f0d..38789c20bcb 100644
--- a/src/plugins/range/README.md
+++ b/src/plugins/range/README.md
@@ -82,7 +82,8 @@ kdb set user:/tests/range/value 7
 kdb set user:/tests/range/value 2
 # RET:0
 
-kdb rm -r user:/tests/range
+kdb rm -r user:/tests/range/
+kdb rm -r spec:/tests/range/
 sudo kdb umount /tests/range
 ```
 
diff --git a/src/plugins/shell/README.md b/src/plugins/shell/README.md
index 68aeaaac0db..c1b22db8094 100644
--- a/src/plugins/shell/README.md
+++ b/src/plugins/shell/README.md
@@ -48,6 +48,7 @@ cat $(kdb get system:/tests/tempfile)
 
 # Undo modifications
 rm $(kdb get system:/tests/tempfile)
+kdb rm -r system:/tests/tempfile
 kdb rm -r system:/tests/shell
 sudo kdb umount system:/tests/shell
 ```
diff --git a/src/plugins/spec/README.md b/src/plugins/spec/README.md
index 32b7bad3e4b..38a173ad5a8 100644
--- a/src/plugins/spec/README.md
+++ b/src/plugins/spec/README.md
@@ -163,8 +163,8 @@ sudo kdb mount battery.ini spec:/example/battery ni
 sudo kdb spec-mount /example/battery
 kdb meta-ls /example/battery/level    # we see it has a check/enum
 kdb meta-get /example/battery/level check/enum    # now we know allowed values
-kdb set /example/battery/level low   # success, low is ok!
-kdb set /example/battery/level x     # fails, not one of the allowed values!
+kdb set user:/example/battery/level low   # success, low is ok!
+kdb set user:/example/battery/level x     # fails, not one of the allowed values!
 ```
 
 ```sh
@@ -176,8 +176,8 @@ kdb meta-set /freedesktop/openicc/device/camera/ array "#1"
 kdb ls /freedesktop/openicc # lets see the whole configuration
 kdb export spec:/freedesktop/openicc ni   # give us details about the specification
 kdb meta-ls spec:/freedesktop/openicc/device/camera/#0/EXIF_serial   # seems like there is a check/type
-kdb set "/freedesktop/openicc/device/camera/#0/EXIF_serial" 203     # success, is a long
-kdb set "/freedesktop/openicc/device/camera/#0/EXIF_serial" x   # fails, not a long
+kdb set "user:/freedesktop/openicc/device/camera/#0/EXIF_serial" 203     # success, is a long
+kdb set "user:/freedesktop/openicc/device/camera/#0/EXIF_serial" x   # fails, not a long
 ```
 
 ## Known Issues
diff --git a/src/plugins/xfconf/README.md b/src/plugins/xfconf/README.md
index e3194bb6af5..f541a1de97b 100644
--- a/src/plugins/xfconf/README.md
+++ b/src/plugins/xfconf/README.md
@@ -84,7 +84,7 @@ kdb get /test/xfwm/general/button_layout
 #> C|
 
 # restore old layout
-kdb set /test/xfwm/general/button_layout "$OLD_LAYOUT"
+kdb set system:/test/xfwm/general/button_layout "$OLD_LAYOUT"
 
 # umount the channel
 kdb umount /test/xfwm
diff --git a/src/plugins/yamlcpp/README.md b/src/plugins/yamlcpp/README.md
index 90ad702c864..5265b79f59a 100644
--- a/src/plugins/yamlcpp/README.md
+++ b/src/plugins/yamlcpp/README.md
@@ -70,7 +70,8 @@ kdb get user:/tests/yamlcpp/fleetwood
 #> mac
 
 # Undo modifications
-kdb rm -r /tests/yamlcpp
+kdb rm -rf user:/tests/yamlcpp
+kdb rm -rf spec:/tests/yamlcpp
 sudo kdb umount /tests/yamlcpp
 ```
 
diff --git a/src/tools/kdb/mount.cpp b/src/tools/kdb/mount.cpp
index 8a9ae12b945..cc966402398 100644
--- a/src/tools/kdb/mount.cpp
+++ b/src/tools/kdb/mount.cpp
@@ -135,7 +135,7 @@ void MountCommand::buildBackend (Cmdline const & cl)
 			  << std::endl;
 		std::cout << "Only system+spec mountpoints are actually absolute." << std::endl;
 		std::cout << "Use `kdb file " << mp << "` to determine where the file(s) are." << std::endl;
-		std::cout << "Use `-q` or use `kdb set /sw/elektra/kdb/#0/current/quiet 1` to suppress infos." << std::endl;
+		std::cout << "Use `-q` or use `kdb set system:/sw/elektra/kdb/#0/current/quiet 1` to suppress infos." << std::endl;
 	}
 
 	if (cl.debug)
diff --git a/tests/shell/check_distribution.sh b/tests/shell/check_distribution.sh
index 9da13f4350e..192b7ee16f7 100755
--- a/tests/shell/check_distribution.sh
+++ b/tests/shell/check_distribution.sh
@@ -82,10 +82,10 @@ check_distribution() {
 	grep $VALUE2 "$FILE2" > /dev/null
 	succeed_if "did not find $VALUE2 within $FILE2"
 
-	"$KDB" rm "$KEY1"
+	"$KDB" rm $(prepend_namespace_if_not_present system "$KEY1")
 	succeed_if "Could not remove $KEY1"
 
-	"$KDB" rm "$KEY2"
+	"$KDB" rm $(prepend_namespace_if_not_present system "$KEY2")
 	succeed_if "Could not remove $KEY2"
 
 	"$KDB" umount "$MOUNTPOINT1" > /dev/null
diff --git a/tests/shell/check_gen.sh b/tests/shell/check_gen.sh
index 9340206a682..79a8a36efba 100755
--- a/tests/shell/check_gen.sh
+++ b/tests/shell/check_gen.sh
@@ -215,7 +215,8 @@ for test_folder in "@CMAKE_SOURCE_DIR@"/tests/shell/gen/*/; do
 			rm "$output_folder$test_name".actual*
 		fi
 
-		"$KDB" rm -r "$cascading_parent"
+		"$KDB" rm -r "$user_parent"
+		"$KDB" rm -r "$spec_parent"
 
 		rm -f "$("$KDB" file "$spec_parent")"
 		rm -f "$("$KDB" file "$user_parent")"
diff --git a/tests/shell/shell_recorder/tutorial_wrapper/README.md b/tests/shell/shell_recorder/tutorial_wrapper/README.md
index 60111aeefe9..dba13109733 100644
--- a/tests/shell/shell_recorder/tutorial_wrapper/README.md
+++ b/tests/shell/shell_recorder/tutorial_wrapper/README.md
@@ -14,7 +14,7 @@ kdb set user:/tests/markdown/napalm death
 
 kdb rm user:/tests/markdown/napalm
 
-kdb rm /tests/markdown/babymetal
+kdb rm system:/tests/markdown/babymetal
 # RET: 11
 # STDERR: Did not find the key
 ```